OSDN Git Service
The Android Automerger [Mon, 19 Sep 2011 13:27:07 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Mon, 19 Sep 2011 03:47:20 +0000 (20:47 -0700)]
IFK80D
The Android Automerger [Mon, 19 Sep 2011 02:30:25 +0000 (19:30 -0700)]
IFK80C
The Android Automerger [Sun, 18 Sep 2011 22:26:05 +0000 (15:26 -0700)]
IFK80B
The Android Automerger [Sun, 18 Sep 2011 13:30:47 +0000 (06:30 -0700)]
IFK80
The Android Automerger [Sun, 18 Sep 2011 13:27:16 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Sat, 17 Sep 2011 15:17:40 +0000 (08:17 -0700)]
IFK77E
The Android Automerger [Sat, 17 Sep 2011 00:18:03 +0000 (17:18 -0700)]
IFK77D
The Android Automerger [Fri, 16 Sep 2011 00:55:40 +0000 (17:55 -0700)]
IFK77C
The Android Automerger [Thu, 15 Sep 2011 21:36:27 +0000 (14:36 -0700)]
IFK77B
Ying Wang [Thu, 15 Sep 2011 20:50:52 +0000 (13:50 -0700)]
Use LOCAL_REQUIRED_MODULES to add dependency of installed shared libraries
Bug:
5200343
Before this change the build system assumes that shared libraries will
be installed to $(TARGET_SHARED_LIBRARIES). That's not true if the
module uses custom LOCAL_MODULE_PATH.
With this change we defer the evaluation of the dependency to after all
Android.mks are loaded and all modules have their installed path
determined.
Change-Id: Ib6628ed44154a90e8668d31691fbbac67125be6c
Ed Heyl [Thu, 15 Sep 2011 16:44:04 +0000 (09:44 -0700)]
correct branch id to 'IF'
Change-Id: I7fd338f355511869559cc5b407b82e77dc3425ed
Ed Heyl [Thu, 15 Sep 2011 14:00:42 +0000 (07:00 -0700)]
IPK77
Change-Id: I3bc35f1705a33b34119a350b84ff54dc19a89da3
Ed Heyl [Thu, 15 Sep 2011 13:49:04 +0000 (06:49 -0700)]
Ed Heyl [Thu, 15 Sep 2011 11:54:20 +0000 (04:54 -0700)]
default version
Change-Id: I6ca2be74916b5bebffd910fdbcbefe158fdfc562
Dianne Hackborn [Wed, 14 Sep 2011 18:03:40 +0000 (11:03 -0700)]
Hello, Android 4.0.
Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
The Android Open Source Project [Wed, 14 Sep 2011 14:22:41 +0000 (07:22 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
Change-Id: Icc3dd8b424542fd5cef9de4768b9c344e7e6381f
Ed Heyl [Wed, 14 Sep 2011 11:30:18 +0000 (04:30 -0700)]
GRK39E
Change-Id: I5fb2ab93a5f39a8d6dd4eca84687970ca9192082
Ed Heyl [Wed, 14 Sep 2011 11:28:57 +0000 (04:28 -0700)]
keep history after reset to GRK39D
The Android Automerger [Wed, 14 Sep 2011 01:28:39 +0000 (18:28 -0700)]
HLK75
Flavio Lerda [Tue, 13 Sep 2011 23:56:58 +0000 (16:56 -0700)]
Merge "Remove VoicemailProvider."
Flavio Lerda [Tue, 13 Sep 2011 23:22:51 +0000 (00:22 +0100)]
Remove VoicemailProvider.
Its code was merged with ContactsProvider.
Bug:
5290063
Change-Id: I0cef43fe14a22f85bc77f7937e5fdbeffcd7f95b
Ed Heyl [Tue, 13 Sep 2011 18:35:44 +0000 (11:35 -0700)]
GWK74
Change-Id: Iaeb2ade7b4f6d964ba70f1e9ed8cf9e369db16a3
Scott Main [Tue, 13 Sep 2011 16:45:57 +0000 (09:45 -0700)]
Merge "cherrypick from Change-Id: I2722879ee7f246e34acca7fd9fb84acff4e8540d docs: some css for android u and javascript"
Scott Main [Fri, 8 Jul 2011 23:17:02 +0000 (16:17 -0700)]
cherrypick from Change-Id: I2722879ee7f246e34acca7fd9fb84acff4e8540d
docs: some css for android u
and javascript
Change-Id: Idb897999eb9c88823ebab418ca5386bca77ca969
The Android Automerger [Tue, 13 Sep 2011 00:17:34 +0000 (17:17 -0700)]
GWK73
Change-Id: Ibe4ffed6b257a075bf2665b43b3f064006524ee1
The Android Automerger [Tue, 13 Sep 2011 00:16:28 +0000 (17:16 -0700)]
keep history after reconcile of gingerbread-release
The Android Automerger [Mon, 12 Sep 2011 16:58:42 +0000 (09:58 -0700)]
HLK73B
Ying Wang [Mon, 12 Sep 2011 16:31:24 +0000 (09:31 -0700)]
Merge "Move forward installed-files.txt in the dependency graph"
The Android Open Source Project [Mon, 12 Sep 2011 14:46:46 +0000 (07:46 -0700)]
Reconcile with gingerbread-release honeycomb-LTE-release
Change-Id: Ia10c7b3cda1b663ac65937929bf2c8e24539b75a
The Android Automerger [Sun, 11 Sep 2011 23:46:55 +0000 (16:46 -0700)]
HLK73
Ed Heyl [Sun, 11 Sep 2011 18:46:10 +0000 (11:46 -0700)]
update platform version
update build id
Change-Id: I3a07e62b50744b7567fd4ba435f2a8528a2f6008
android-merger [Sat, 10 Sep 2011 03:17:36 +0000 (20:17 -0700)]
fix space
Change-Id: I29601b2fd5ec607868374e222031598835549854
android-merger [Sat, 10 Sep 2011 01:37:23 +0000 (18:37 -0700)]
GRK71 again
Change-Id: I4ad2c1583e83f1208ca1c519ea1c03352f335e61
Ying Wang [Fri, 9 Sep 2011 23:35:53 +0000 (16:35 -0700)]
Move forward installed-files.txt in the dependency graph
Bug:
5265104
- Move installed-files.txt forward to ahead of system.img in the
dependency graph, so that even if the system.img fails to build due to
too large size we can still get the size stats.
- Change the script tools/fileslist.py to sort items in decreasing size.
Change-Id: I5913bc51971e341ffbfcf3fa449c987f126e409b
android-merger [Fri, 9 Sep 2011 23:49:33 +0000 (16:49 -0700)]
GRK71 again
Change-Id: Ib5f68df8ad7022dd0760f38e72c8fc3840be92b4
android-merger [Fri, 9 Sep 2011 21:50:09 +0000 (14:50 -0700)]
GRK71
Change-Id: Ia00607e866b1ce3633eb0cc6051c5a9d70bea7f5
The Android Automerger [Fri, 9 Sep 2011 20:04:43 +0000 (13:04 -0700)]
HLK71
The Android Open Source Project [Fri, 9 Sep 2011 19:29:25 +0000 (12:29 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I0f44d27ec2e8b99f45ee059d78cae7cceb41931e
Brian Muramatsu [Fri, 9 Sep 2011 19:04:29 +0000 (12:04 -0700)]
am
ae55f41c: am
89ba0f7e: am
1615c2fc: Rename generic_arm5 to generic_armv5
* commit '
ae55f41c5d74b1aa58ef5015c613541e77f55034':
Rename generic_arm5 to generic_armv5
Brian Muramatsu [Fri, 9 Sep 2011 19:04:27 +0000 (12:04 -0700)]
am
8658fa51: am
9d014e65: am
9353a3be: Disable Dexpreopt for generic_arm5
* commit '
8658fa51d15290cf43178d0633b53f11ff08a4aa':
Disable Dexpreopt for generic_arm5
Brian Muramatsu [Fri, 9 Sep 2011 19:04:25 +0000 (12:04 -0700)]
am
5d16ff13: am
372a1e0b: am
31e27eeb: generic_arm5 product
* commit '
5d16ff13d7c6c3da38ba29a412d535221cee7a60':
generic_arm5 product
Jean-Baptiste Queru [Fri, 9 Sep 2011 12:44:59 +0000 (05:44 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I8a0b1dbf38c17488d6948035158fbd720df062c3
Ying Wang [Thu, 8 Sep 2011 21:48:38 +0000 (14:48 -0700)]
am
41346ae4: am
ba35b2d6: resolved conflicts for merge of
162991be to gingerbread-plus-aosp
* commit '
41346ae4077c7dee66a7c04dc91714569dca9303':
Allow uninstallable APPs.
Ying Wang [Thu, 8 Sep 2011 21:26:28 +0000 (14:26 -0700)]
Merge "Provide LOCAL_RENDERSCRIPT_TARGET_API override."
Ying Wang [Thu, 8 Sep 2011 21:16:23 +0000 (14:16 -0700)]
Merge "Discard hidden files when rounding up resource."
Doug Zongker [Thu, 8 Sep 2011 19:04:27 +0000 (12:04 -0700)]
Merge "save uid/gid/mode information of boot and recovery files"
Brian Muramatsu [Thu, 8 Sep 2011 18:15:38 +0000 (11:15 -0700)]
am
89ba0f7e: am
1615c2fc: Rename generic_arm5 to generic_armv5
* commit '
89ba0f7e62e94fbe010bcf9aab3e1be035ffb44a':
Rename generic_arm5 to generic_armv5
Brian Muramatsu [Thu, 8 Sep 2011 18:13:50 +0000 (11:13 -0700)]
am
1615c2fc: Rename generic_arm5 to generic_armv5
* commit '
1615c2fcb60c7164cd8629e8c78cef551ebd329a':
Rename generic_arm5 to generic_armv5
Brian Muramatsu [Thu, 8 Sep 2011 17:36:03 +0000 (10:36 -0700)]
Rename generic_arm5 to generic_armv5
Bug
5267392
Change-Id: I5129d5ba283e711a2cb5840fc0c9b707f653936a
Brian Muramatsu [Thu, 8 Sep 2011 17:26:29 +0000 (10:26 -0700)]
am
9d014e65: am
9353a3be: Disable Dexpreopt for generic_arm5
* commit '
9d014e6570deb3861b503833823e56e1c589626c':
Disable Dexpreopt for generic_arm5
Brian Muramatsu [Thu, 8 Sep 2011 17:24:14 +0000 (10:24 -0700)]
am
9353a3be: Disable Dexpreopt for generic_arm5
* commit '
9353a3be5fca8a83c3a60e890fbca323f9fb0e04':
Disable Dexpreopt for generic_arm5
Raphael [Thu, 8 Sep 2011 17:16:44 +0000 (10:16 -0700)]
Merge "Enable 'make traceview' under Windows."
Brian Muramatsu [Thu, 8 Sep 2011 17:08:27 +0000 (10:08 -0700)]
am
3eae5b7c: am
08b8e002: am
2306106d: Use package.apk.unaligned in CTS Build
* commit '
3eae5b7c1b3197bed4c883a671cfea9d5d9570bf':
Use package.apk.unaligned in CTS Build
Brian Muramatsu [Thu, 8 Sep 2011 01:12:22 +0000 (18:12 -0700)]
Disable Dexpreopt for generic_arm5
Bug
5267392
After coming across another place where I would have to use
package.apk.unaligned, I decided maybe it is best to just
disable dexpreopt as was previously suggested.
Use package.apks in the CTS Makefile task.
Change-Id: Iec839a72f4b53441337523b8a9cccda657eec8e8
Brian Muramatsu [Thu, 8 Sep 2011 00:13:30 +0000 (17:13 -0700)]
am
372a1e0b: am
31e27eeb: generic_arm5 product
* commit '
372a1e0ba362ba509d44a1ed4b8eb554b1da7180':
generic_arm5 product
Brian Muramatsu [Thu, 8 Sep 2011 00:12:16 +0000 (17:12 -0700)]
am
31e27eeb: generic_arm5 product
* commit '
31e27eebc3108d788d040228e5143df3e87b1424':
generic_arm5 product
Brian Muramatsu [Wed, 7 Sep 2011 20:03:49 +0000 (13:03 -0700)]
generic_arm5 product
Bug
5267392
Copied the prior generic product but tried to include
Makefiles from the generic product when possible to
avoid drifting.
Change-Id: I7893adb65c37c1257bcb5224848f4cd7cd93d2f9
Ying Wang [Wed, 7 Sep 2011 21:31:47 +0000 (14:31 -0700)]
Add ABI specific include path for NDK.
Change-Id: I37a935126b9a1e544fc5a7471cf6ca224fc89cf3
Doug Zongker [Wed, 7 Sep 2011 21:11:51 +0000 (14:11 -0700)]
save uid/gid/mode information of boot and recovery files
Save these in the target_files so we don't have to depend on using the
contents of android_filesystem_config.h at the tip of tree.
Bug:
5266067
Change-Id: Ica5dd43a2013c9db72d7c9434f9d7de1abaf18f9
Ying Wang [Wed, 7 Sep 2011 18:25:42 +0000 (11:25 -0700)]
am
ba35b2d6: resolved conflicts for merge of
162991be to gingerbread-plus-aosp
* commit '
ba35b2d61531a071533891307904e6ad7f81fb65':
Allow uninstallable APPs.
Ying Wang [Wed, 7 Sep 2011 18:20:28 +0000 (11:20 -0700)]
resolved conflicts for merge of
162991be to gingerbread-plus-aosp
Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5
Ying Wang [Wed, 7 Sep 2011 17:21:42 +0000 (10:21 -0700)]
Allow uninstallable APPs.
Bug:
5264671
This is needed by cts tests.
It's harmless to existing modules.
Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
android-merger [Wed, 7 Sep 2011 00:36:11 +0000 (17:36 -0700)]
GRK39D
Change-Id: I3801d5534b4f6bbdbd37cefa74f71a35ea5ffa59
Raphael [Fri, 2 Sep 2011 21:13:57 +0000 (14:13 -0700)]
Enable 'make traceview' under Windows.
Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
The Android Automerger [Tue, 6 Sep 2011 21:13:39 +0000 (14:13 -0700)]
HLK42E
Justin Ho [Tue, 6 Sep 2011 20:18:22 +0000 (13:18 -0700)]
Merge "Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug:
5032006"
Justin Ho [Tue, 6 Sep 2011 20:04:36 +0000 (13:04 -0700)]
Updated dex-preopt BOOTCLASSPATH with values from init.rc
Bug:
5032006
Change-Id: I6ed7e55ec2b278c0d60ad4e17208480d05af61bc
Doug Zongker [Fri, 2 Sep 2011 23:12:56 +0000 (16:12 -0700)]
allow setting LOCAL_STRIP_MODULE on multi_prebuilts
Change-Id: I4a58255381ba8a50d8f9512bf9892f5050599393
Brian Muramatsu [Fri, 2 Sep 2011 23:56:07 +0000 (16:56 -0700)]
am
08b8e002: am
2306106d: Use package.apk.unaligned in CTS Build
* commit '
08b8e0024812ea907cf3938bcd07b8dca6188eaf':
Use package.apk.unaligned in CTS Build
The Android Automerger [Fri, 2 Sep 2011 23:55:24 +0000 (16:55 -0700)]
GWK15H
Change-Id: I0f58082949e91e206fd0dce80a37d107ba240454
Brian Muramatsu [Fri, 2 Sep 2011 23:53:43 +0000 (16:53 -0700)]
am
2306106d: Use package.apk.unaligned in CTS Build
* commit '
2306106d3e2cd774ef0b2cd782442f90c402341f':
Use package.apk.unaligned in CTS Build
Brian Muramatsu [Fri, 2 Sep 2011 22:29:10 +0000 (15:29 -0700)]
Use package.apk.unaligned in CTS Build
Bug
5252989
This prevents dexopt installation failures when trying to
install CTS apks on production devices.
Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
The Android Automerger [Fri, 2 Sep 2011 16:28:28 +0000 (09:28 -0700)]
HLK42D
Justin Ho [Fri, 2 Sep 2011 15:00:53 +0000 (08:00 -0700)]
Remove pinyinIME
Change-Id: If83419336294eb56d5b96384a7bc9d9821888b02
Owen Lin [Fri, 2 Sep 2011 00:43:31 +0000 (17:43 -0700)]
Merge "Replace GalleryNew3D with Gallery2 in AOSP."
Justin Ho [Thu, 1 Sep 2011 20:34:20 +0000 (13:34 -0700)]
Add image size calcuations into the script
Change-Id: Ide13a873982bae21e2b8735a235389a660abd592
android-merger [Thu, 1 Sep 2011 19:10:10 +0000 (12:10 -0700)]
GRK39C
Change-Id: I2df91acada778458f61961966aae6f575900e7b6
Owen Lin [Thu, 1 Sep 2011 06:21:22 +0000 (14:21 +0800)]
Replace GalleryNew3D with Gallery2 in AOSP.
Change-Id: I61e35fa7e629872d2c961a8fa35d8068fb918cc6
Justin Ho [Wed, 31 Aug 2011 15:36:46 +0000 (08:36 -0700)]
Calculate system image size at build, for harvesting later
Change-Id: I6bfcde0e5df3f6da453f28354839e356f9191c0e
Justin Ho [Tue, 30 Aug 2011 21:29:18 +0000 (14:29 -0700)]
Revert Ic7c40c50: Support to run dex-preopt on prebuilt apks
Collect some additional system image space, moving odex files to user partition on trygon-user
Change-Id: If992536ff0da14cc5b9ba51811b8a0b76f1b8f83
The Android Automerger [Tue, 30 Aug 2011 18:07:24 +0000 (11:07 -0700)]
HLK42C
android-merger [Tue, 30 Aug 2011 16:14:32 +0000 (09:14 -0700)]
GRK39B
Change-Id: Id36268001249167160dc7ea0908ddb85b69515a4
Stephen Hines [Tue, 30 Aug 2011 01:53:53 +0000 (18:53 -0700)]
Provide LOCAL_RENDERSCRIPT_TARGET_API override.
BUG=
5206223
This allows us to set the RS API level independent of the other SDK
versions that a developer might choose.
Change-Id: Id8b476abcbbbdaa86e04ba0ea16414cb2fa5bd15
Eino-Ville Talvala [Mon, 29 Aug 2011 22:12:04 +0000 (15:12 -0700)]
Merge "Add filterfw.jar to standard list of java libraries to include."
Ying Wang [Mon, 29 Aug 2011 18:05:08 +0000 (11:05 -0700)]
am
a1b603a5: am
4b398749: am
c5033a33: Merge "x86: remove obsolete comments"
* commit '
a1b603a556e338d4899a62ea37810aff81ab7fa1':
x86: remove obsolete comments
David 'Digit' Turner [Mon, 29 Aug 2011 18:04:47 +0000 (11:04 -0700)]
am
3db43165: am
80d41e4b: am
a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '
3db43165b09defcbeebdbeddff158b4e1f85d5c4':
sdk: add DLL_EXTENSION as an atree variable
David 'Digit' Turner [Mon, 29 Aug 2011 17:58:09 +0000 (10:58 -0700)]
Merge "resolved conflicts for merge of
6da54b6e to master"
Eino-Ville Talvala [Mon, 22 Aug 2011 17:42:44 +0000 (10:42 -0700)]
Add filterfw.jar to standard list of java libraries to include.
Since classes from this jar are part of the public API, it should be
included by default.
Also add the jar into the dex_preopt list.
Bug:
5098987
Change-Id: Ib39deffea43714eb56630ad1d65411cfde5878fd
Doug Zongker [Fri, 26 Aug 2011 20:46:40 +0000 (13:46 -0700)]
patch the /system/build.prop file last
Works around a problem observed on a retail device: incremental update
from build 1 to build 2 partially completed, leaving a mix of files
from the two builds. (Why it booted into the regular system instead
of recovery to restart update installation is still a mystery.)
build.prop was one of the files updated, so the device reported itself
as having build 2. The device hobbled along for months in this state,
until build 3 was released and the 2-to-3 incremental package
repeatedly failed (because some of the files it was trying to patch
were build 1).
This change makes updating build.prop the very last thing does by an
incremental update script, so if installation is aborted and the
regular system starts (and works at all), it will continue reporting
itself as build 1 and be sent the 1-to-2 OTA package again.
Change-Id: I1edc1dcef2bd2495b6fd96517c2f4c574b994f27
Ying Wang [Fri, 26 Aug 2011 19:12:48 +0000 (12:12 -0700)]
am
4b398749: am
c5033a33: Merge "x86: remove obsolete comments"
* commit '
4b3987498eb15dc654fe572aadf53396aac36479':
x86: remove obsolete comments
Ying Wang [Fri, 26 Aug 2011 19:10:45 +0000 (12:10 -0700)]
am
c5033a33: Merge "x86: remove obsolete comments"
* commit '
c5033a3357b824a8285da67357a0d289750f4a72':
x86: remove obsolete comments
Ying Wang [Fri, 26 Aug 2011 17:41:16 +0000 (10:41 -0700)]
Merge "x86: remove obsolete comments"
David 'Digit' Turner [Thu, 25 Aug 2011 22:53:34 +0000 (00:53 +0200)]
resolved conflicts for merge of
6da54b6e to master
Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
David 'Digit' Turner [Thu, 25 Aug 2011 21:30:00 +0000 (14:30 -0700)]
am
80d41e4b: am
a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '
80d41e4b7555aed399c7bd23647947d7eade3fe6':
sdk: add DLL_EXTENSION as an atree variable
David 'Digit' Turner [Thu, 25 Aug 2011 21:23:32 +0000 (23:23 +0200)]
resolved conflicts for merge of
7be88d00 to honeycomb-plus-aosp
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
David 'Digit' Turner [Thu, 25 Aug 2011 19:14:35 +0000 (12:14 -0700)]
am
a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '
a2cc9b227ae01803dfc4bc1987071fd6eee08bb6':
sdk: add DLL_EXTENSION as an atree variable
David 'Digit' Turner [Thu, 25 Aug 2011 19:14:33 +0000 (12:14 -0700)]
am
77c6261f: Merge "emulator: Enable GLES emulation libraries"
* commit '
77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
emulator: Enable GLES emulation libraries
David 'Digit' Turner [Thu, 25 Aug 2011 19:03:03 +0000 (12:03 -0700)]
Merge "sdk: add DLL_EXTENSION as an atree variable"
David 'Digit' Turner [Thu, 25 Aug 2011 19:02:34 +0000 (12:02 -0700)]
Merge "emulator: Enable GLES emulation libraries"