OSDN Git Service
The Android Automerger [Thu, 29 Sep 2011 13:27:34 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Thu, 29 Sep 2011 00:37:13 +0000 (17:37 -0700)]
IFK90B
The Android Automerger [Thu, 29 Sep 2011 00:34:20 +0000 (17:34 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
David Turner [Wed, 28 Sep 2011 20:54:08 +0000 (22:54 +0200)]
Cherrypick 944311 from master. do not merge.
emulator: Enable dex-preoptimization in emulator-specific builds
This patch re-enables dex preoptimization in emulator-specific
builds. This considerably speeds up the first-boot of SDK AVDs
since the dex optimization pass is performed during the build
instead.
This was enabled in a previous patch, then reverted due to a
bug in the build system that has been fixed since.
This patch doesn't affect any device build.
Change-Id: Ie711fb4e1672993b7f7f4b8c5313a89d0b8734d6
Xavier Ducrohet [Wed, 28 Sep 2011 22:39:32 +0000 (15:39 -0700)]
Add calendar to the SDK system image.
Change-Id: Iaedb675fd4348744a3efacf9d57d401045aeffa9
The Android Automerger [Wed, 28 Sep 2011 13:12:35 +0000 (06:12 -0700)]
IFK90
The Android Automerger [Wed, 28 Sep 2011 13:07:40 +0000 (06:07 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Tue, 27 Sep 2011 20:34:26 +0000 (13:34 -0700)]
IFK89B
The Android Automerger [Tue, 27 Sep 2011 20:29:33 +0000 (13:29 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Tue, 27 Sep 2011 11:21:49 +0000 (04:21 -0700)]
IFK89
The Android Automerger [Tue, 27 Sep 2011 11:18:29 +0000 (04:18 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Tue, 27 Sep 2011 10:56:33 +0000 (03:56 -0700)]
IFK88C
The Android Automerger [Tue, 27 Sep 2011 10:51:01 +0000 (03:51 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Mon, 26 Sep 2011 23:20:08 +0000 (16:20 -0700)]
IFK88B
The Android Automerger [Mon, 26 Sep 2011 23:15:39 +0000 (16:15 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Mon, 26 Sep 2011 13:34:40 +0000 (06:34 -0700)]
IFK88
The Android Automerger [Mon, 26 Sep 2011 13:32:18 +0000 (06:32 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Mon, 26 Sep 2011 01:18:02 +0000 (18:18 -0700)]
IFK87B
The Android Automerger [Mon, 26 Sep 2011 01:14:09 +0000 (18:14 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Sun, 25 Sep 2011 13:32:51 +0000 (06:32 -0700)]
IFK87
The Android Automerger [Sun, 25 Sep 2011 13:27:14 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Sat, 24 Sep 2011 00:57:20 +0000 (17:57 -0700)]
IFK85C
Christopher Tate [Fri, 23 Sep 2011 01:24:30 +0000 (18:24 -0700)]
Add the shared-storage backup component to the build
Oops. Fixes bug
5341264
Change-Id: I99c51226c236c40bf56b1b94917f0eff56502963
Ying Wang [Fri, 23 Sep 2011 21:35:51 +0000 (14:35 -0700)]
Add lohit-fonts.
Change-Id: Idf0641ce2d8f8195520e7e283f985271482b2835
The Android Automerger [Fri, 23 Sep 2011 20:39:09 +0000 (13:39 -0700)]
IFK85B
Christopher Tate [Fri, 23 Sep 2011 19:59:28 +0000 (12:59 -0700)]
Merge "Add the shared-storage backup component to the build" into ics-factoryrom
The Android Automerger [Fri, 23 Sep 2011 18:38:53 +0000 (11:38 -0700)]
IFK85
The Android Automerger [Fri, 23 Sep 2011 18:33:21 +0000 (11:33 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Christopher Tate [Fri, 23 Sep 2011 01:24:30 +0000 (18:24 -0700)]
Add the shared-storage backup component to the build
Oops. Fixes bug
5341264
Change-Id: I99c51226c236c40bf56b1b94917f0eff56502963
The Android Automerger [Thu, 22 Sep 2011 22:43:11 +0000 (15:43 -0700)]
IFK84B
The Android Automerger [Thu, 22 Sep 2011 13:31:13 +0000 (06:31 -0700)]
IFK84
The Android Automerger [Thu, 22 Sep 2011 13:27:14 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Xavier Ducrohet [Wed, 21 Sep 2011 17:22:19 +0000 (10:22 -0700)]
Cherrypick
6de7bc61 from master. do not merge.
Copy notice file in the new system image folder
Change-Id: I66496f382b2d13b030de569b573630f3abe5b9de
The Android Automerger [Wed, 21 Sep 2011 19:44:06 +0000 (12:44 -0700)]
IFK83B
The Android Automerger [Wed, 21 Sep 2011 13:32:26 +0000 (06:32 -0700)]
IFK83
The Android Automerger [Wed, 21 Sep 2011 13:28:22 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Wed, 21 Sep 2011 03:46:35 +0000 (20:46 -0700)]
IFK81D
The Android Automerger [Wed, 21 Sep 2011 03:43:27 +0000 (20:43 -0700)]
IFK82D
The Android Automerger [Wed, 21 Sep 2011 03:42:59 +0000 (20:42 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Ying Wang [Wed, 21 Sep 2011 03:02:17 +0000 (20:02 -0700)]
Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom
The Android Automerger [Tue, 20 Sep 2011 23:42:11 +0000 (16:42 -0700)]
IFK82C
The Android Automerger [Tue, 20 Sep 2011 23:24:59 +0000 (16:24 -0700)]
IFK82B
The Android Automerger [Tue, 20 Sep 2011 13:30:19 +0000 (06:30 -0700)]
IFK82
The Android Automerger [Tue, 20 Sep 2011 13:26:52 +0000 (06:26 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Tue, 20 Sep 2011 04:54:35 +0000 (21:54 -0700)]
IFK81C
The Android Automerger [Mon, 19 Sep 2011 23:39:02 +0000 (16:39 -0700)]
IFK81B
The Android Automerger [Mon, 19 Sep 2011 13:29:30 +0000 (06:29 -0700)]
IFK81
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
Raphael [Fri, 16 Sep 2011 15:59:13 +0000 (08:59 -0700)]
Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.
Required by Change-Id Ic651e3c3 in sdk.git
Cherry-pick from master
c36df7b12bb5e1e97e39c3576d330af37536b02d
Change-Id: Ic51ad7df01ce1bc926ba69f8a031a060edbf0bd1
Raphael [Thu, 15 Sep 2011 18:21:08 +0000 (11:21 -0700)]
Don't strip llvm-rs-rc in core/Makefile. DO NOT MERGE.
This is done in development/build/sdk.atree now.
Cherry-pick from master
469bbdf8c37a74e236d129faeaa5483838af9028
Raphael [Wed, 14 Sep 2011 22:07:05 +0000 (15:07 -0700)]
Add rm and strip abilities to atree. DO NOT MERGE.
The new line syntax is:
[SRC] [rm|strip] DEST
This allows one to write things like this in atree:
bin/src
bin/src bin/dest
bin/src "bin/another file name"
rm dest/file
rm dest/dir # recursive
strip bin/src
bin/src strip bin/dest
Src and dest can contain spaces if full enclosed in double-quotes.
The strip command can be overridden using the STRIP env var.
Cherry-pick from master
0b3ec5d32f15bdea67d15af95cf68e455867c668
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
Ying Wang [Thu, 15 Sep 2011 19:00:52 +0000 (12:00 -0700)]
Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.
So that prebuilt shared libraries can be referenced with the module name
in other module's Android.mk.
Change-Id: I4c4b471696642694b805b71dd7605b91724ad924
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
OSDN Git Service
