Commit graph

665 commits

Author SHA1 Message Date
Guang Zhu
fb3083ef6f am 96d9fa29: resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp
* commit '96d9fa29cd1ff48b733eb090e99fe165d194d313':
  use default shell (mksh) in emulator
2012-07-12 09:36:35 -07:00
Guang Zhu
96d9fa29cd resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
2012-07-11 19:36:17 -07:00
Guang Zhu
ef1335eda4 use default shell (mksh) in emulator
remove the override to use ash as shell so that mksh is the
default in 'generic' product type

Change-Id: I91d76d0fc522baf5d47096ab19ea264c9b1268e6
2012-07-11 18:35:08 -07:00
Wink Saville
a44a92914b Merge commit 'c16c9454' into mit
* commit 'c16c9454':
  Create telephony-common and mms-common
2012-07-11 18:08:21 -07:00
Wink Saville
c16c945497 Create telephony-common and mms-common
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
  frameworks/opt/mms

telephony-common was created by moving some of
  frameworks/base/telephony
to:
  frameworks/opt/telephony

Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
2012-07-06 18:06:36 -07:00
Marc Blank
f173c6be57 Change build targets to use Email2/Exchange2
Change-Id: I1b93b112b4d31ce379d33e2d1202fc90bb8d21eb
2012-06-28 16:55:57 -07:00
Keun young Park
fb8cc2d4e3 replace development/data/etc/ to device/generic/goldfish/data/etc
- Files under development/data/etc will be removed

Change-Id: I39907cda9b3253f1608ed3231a8a9945087348d7
2012-06-19 18:02:22 -07:00
Jean-Baptiste Queru
a644e7bb66 am 03bb0851: Remove references to packages that don\'t exist any more.
* commit '03bb0851d6a86ac51becaa132f96ed1d8f4b604c':
  Remove references to packages that don't exist any more.
2012-06-19 11:27:26 -07:00
Jean-Baptiste Queru
03bb0851d6 Remove references to packages that don't exist any more.
Those can't be found anywhere in the build system.

Change-Id: I3b3727e7735de0dbffae930cf99a6d6ccbc79570
2012-06-19 11:17:27 -07:00
Guang Zhu
d214c7e495 am 5d76a3f2: Merge "add uiautomator into system image" into jb-dev
* commit '5d76a3f2d53fceb883d84d214c28c51bc3e5b43c':
  add uiautomator into system image
2012-06-18 11:55:49 -07:00
Guang Zhu
e770754b9f add uiautomator into system image
this includes 2 pieces:
* uiautomator shell script
* uiautomator.jar: test runner and the automation framework
  classes

source is under frameworks/testing/uiautomator

Change-Id: I237d85b8917d2451cf35362d2e34786940897921
2012-06-17 00:33:08 -07:00
Jean-Baptiste Queru
12d24b5aab resolved conflicts for merge of 76af0657 to jb-dev-plus-aosp
Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d
2012-06-12 14:57:27 -07:00
Bruce Beare
46b48e88fe full_x86: use telephony profile
Author: Bruce Beare <bruce.j.beare@intel.com>
Change-Id: I3c086f3f38049e9a7cc2e653aa0ee0d2a2ca1a79
2012-06-12 14:34:53 -07:00
Jamie Gennis
82c11caca0 am f3b1395a: Merge "Add atrace to core.mk" into jb-dev
* commit 'f3b1395a41a1f882fac74b8a55723af8f77535d0':
  Add atrace to core.mk
2012-06-12 12:41:26 -07:00
Jean-Baptiste Queru
ddb706785b am 5b7633be: am 06e515dd: Merge "This patch addresses the following issues:"
* commit '5b7633be4e107888db7b6fc3d50be6aa8eb7f95c':
  This patch addresses the following issues:
2012-06-12 08:05:22 -07:00
Jamie Gennis
f3b1395a41 Merge "Add atrace to core.mk" into jb-dev 2012-06-11 12:04:24 -07:00
Jamie Gennis
a9efae347f Add atrace to core.mk
This change adds the atrace binary and init.trace.rc to the system image for
all builds.

Bug: 6513400
Change-Id: Ib979f4b6ffe799ab56e66fc3acfad754d216c576
2012-06-08 14:59:42 -07:00
Eino-Ville Talvala
5b401f8b8b am e245ecdc: Merge "Add LegacyCamera to SDK product" into jb-dev
* commit 'e245ecdc0a87fb198894995ffbc4e6fec8d812f8':
  Add LegacyCamera to SDK product
2012-06-08 09:34:52 -07:00
Eino-Ville Talvala
e245ecdc0a Merge "Add LegacyCamera to SDK product" into jb-dev 2012-06-08 09:32:27 -07:00
Keun young Park
d3da15a5ee am 6aae80a8: Merge "add mini.mk for common configurations for mini products" into jb-dev
* commit '6aae80a8d500084466c7e6d90769dda9a5b20507':
  add mini.mk for common configurations for mini products
2012-06-06 15:51:24 -07:00
Keun young Park
fd9f8bcfdb add mini.mk for common configurations for mini products
- it is used for generic pdk release

Bug: 6540216

Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
2012-06-06 14:15:57 -07:00
Raghu Gandham
f70dec9281 This patch addresses the following issues:
1. Fix a typo.
2. Include libffi in the MIPS list of Product Packages.
3. Default to JSC for MIPS until the MIPS support in v8 lands in aosp.
2012-06-05 15:33:37 -07:00
Eino-Ville Talvala
97150497b3 Add LegacyCamera to SDK product
Change-Id: I690bf0ba6435c520c3de1d6fb250ffae1ae45475
2012-06-05 13:53:33 -07:00
Jean-Baptiste Queru
89a0306ec3 am e7af5e24: Add Live Wallpapers to AOSP builds
* commit 'e7af5e2428d6c831acb73fac6547c3a780dca729':
  Add Live Wallpapers to AOSP builds
2012-06-02 08:35:03 -07:00
Jean-Baptiste Queru
e7af5e2428 Add Live Wallpapers to AOSP builds
Change-Id: I76df14d99fd876b765510ced8f5523e3bafce291
2012-06-01 18:27:03 -07:00
Wink Saville
84690f969e am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev
* commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b':
  Fix rild running in Nakasi.
2012-05-31 13:25:41 -07:00
Wink Saville
f97105ea89 Merge "Fix rild running in Nakasi." into jb-dev 2012-05-31 13:21:34 -07:00
Wink Saville
689f117b63 Fix rild running in Nakasi.
The module rild is telephony specific, since Nakasi has no radio
it shouldn't run rild. Changing the build system so rild is optional
for products that don't have telephony support.

Since rild is now optional, it is necessary to add it explicitly to
the sdk build as the sdk build is special.

Bug: 6463864
Change-Id: If944e051023b567807585fb91163a1e3f79c1024
2012-05-31 10:35:52 -07:00
Keun young Park
53ba6b22f9 am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
* commit '15d151367482b6ed47cecf1a578b365b7c6ccab3':
  change location of apns-conf.xml and vold.conf
2012-05-30 20:34:00 -07:00
Keun young Park
e581d866fb change location of apns-conf.xml and vold.conf
- from development/data to device/generic/goldfish/data

Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9
2012-05-30 16:32:30 -07:00
Jean-Baptiste Queru
fe5d7c788b am a2bfde63: am fed2587c: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
* commit 'a2bfde63b767378979145cb8be55d9a305e2b4f5':
  dalvik heapsize: Remove obsolete flag, set porperty
2012-05-25 07:19:55 -07:00
Jean-Baptiste Queru
4261ace013 resolved conflicts for merge of 9f312b81 to jb-dev-plus-aosp
Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98
2012-05-25 07:16:04 -07:00
Bruce Beare
5b21303927 dalvik heapsize: Remove obsolete flag, set porperty
Change-Id: I51360867171aaebce071b3391678ff6e7f191dc5
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-24 11:38:18 -07:00
Jean-Baptiste Queru
3deea32a31 Merge "Enable DRM support in the SDK system image" 2012-05-24 10:14:05 -07:00
Jean-Baptiste Queru
e4abb37a73 am 27a4fa10: am 2d0055dd: Merge "Revert "Add module \'idmap\'.""
* commit '27a4fa10a90c754da307ddda14e16c3864dc0413':
  Revert "Add module 'idmap'."
2012-05-23 16:16:30 -07:00
Jean-Baptiste Queru
4412133fb8 Revert "Add module 'idmap'."
This reverts commit eb7c4a5e9e.
2012-05-23 16:03:14 -07:00
Jean-Baptiste Queru
a213c695a0 am 372936d8: am c47b90a9: Merge "Add module \'idmap\'."
* commit '372936d881a2b64333c88ccb012ec57f80a2e424':
  Add module 'idmap'.
2012-05-23 16:01:09 -07:00
Jean-Baptiste Queru
c47b90a9a9 Merge "Add module 'idmap'." 2012-05-23 14:40:00 -07:00
Andrew Hsieh
b968c85edf Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason
that atom-specific instruciton like "movbe" isn't "generic" to
x86 Android devices and x86 host running emulator-x86, which may
crash non-atom host in VT because "movbe" isn't supported natively.

Also revert previous fix in TARGET_linux-x86.mk which conservatively
disable "movbe" across the board

Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d
2012-05-21 14:27:59 +08:00
James Dong
3ffbea3dcf am 4007faf4: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
* commit '4007faf4c6bb99883f6ac7a8d80a956837909ff8':
  Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
2012-05-16 01:22:31 -07:00
James Dong
4007faf4c6 Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug: 6502980

Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
2012-05-16 01:17:42 -07:00
James Dong
4d5c4dc3e0 am c8bfb1ca: Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
* commit 'c8bfb1cad15822f31e3f3250d00b4ef6761c19c4':
  Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
2012-05-15 14:59:09 -07:00
James Dong
c8bfb1cad1 Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
Fixed the broken build first.

This reverts commit e85f05be14.
2012-05-15 14:47:37 -07:00
James Dong
a0404bf3b7 am e85f05be: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
* commit 'e85f05be147bf7d916d1b1622f6f3038dac8913b':
  Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
2012-05-15 14:27:02 -07:00
James Dong
e85f05be14 Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug: 6328360

Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
2012-05-15 00:45:45 -07:00
Jean-Baptiste Queru
44fd5580b5 am 7eb749d1: am 2d7274de: Merge "MIPS generic target support"
* commit '7eb749d134fd52e23be7218bf2ea7dfa1b1180b3':
  MIPS generic target support
2012-05-11 21:53:54 -07:00
Victoria Lease
057366e21d am 67095e00: Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
* commit '67095e005c48c639954d4ada60f391ff4923f0eb':
  Parse external/cibu-fonts/fonts.mk.
2012-05-11 16:54:00 -07:00
Victoria Lease
67095e005c Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev 2012-05-11 16:51:47 -07:00
Jean-Baptiste Queru
2d7274de30 Merge "MIPS generic target support" 2012-05-11 14:46:38 -07:00
Jean-Baptiste Queru
8ff07372c1 am 0e2bc24e: am cd99ece7: Merge "x86: customize the malloced address to be 16-byte aligned"
* commit '0e2bc24ef002ec612e94a64da297a7698acde749':
  x86: customize the malloced address to be 16-byte aligned
2012-05-11 14:12:10 -07:00