Commit Graph

6313 Commits

Author SHA1 Message Date
Ying Wang 04c485843f Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom 2011-09-20 20:02:17 -07:00
Raphael 514c487dcb Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.
Required by Change-Id Ic651e3c3 in sdk.git

Cherry-pick from master c36df7b12b

Change-Id: Ic51ad7df01ce1bc926ba69f8a031a060edbf0bd1
2011-09-16 21:35:42 -07:00
Raphael 77fed26921 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 469bbdf8c3
2011-09-16 21:25:49 -07:00
Raphael 131292c042 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 0b3ec5d32f
2011-09-16 21:25:18 -07:00
Ying Wang c36b450ab1 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
2011-09-15 16:13:39 -07:00
Ying Wang 704c0c9fca 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
2011-09-15 14:05:49 -07:00
Ed Heyl 58dcc788b9 Merge commit '4d7ddab160ba29247225e11c2092dcfd68bd6baf' into ics-factoryrom 2011-09-15 06:49:04 -07:00
Ed Heyl b8fe43be28 default version
Change-Id: I6ca2be74916b5bebffd910fdbcbefe158fdfc562
2011-09-15 04:54:20 -07:00
Dianne Hackborn 4d7ddab160 Hello, Android 4.0.
Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
2011-09-14 13:52:02 -07:00
The Android Open Source Project 3899d3ec56 Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
Change-Id: Icc3dd8b424542fd5cef9de4768b9c344e7e6381f
2011-09-14 07:22:41 -07:00
Ed Heyl 7bfcce4d04 GRK39E
Change-Id: I5fb2ab93a5f39a8d6dd4eca84687970ca9192082
2011-09-14 04:30:18 -07:00
Ed Heyl 33ca5df115 keep history after reset to GRK39D 2011-09-14 04:28:57 -07:00
The Android Automerger b6455e9ecf HLK75 2011-09-13 18:28:39 -07:00
Flavio Lerda ae3ddfbd93 Merge "Remove VoicemailProvider." 2011-09-13 16:56:58 -07:00
Flavio Lerda 68b8b7b61b Remove VoicemailProvider.
Its code was merged with ContactsProvider.

Bug: 5290063
Change-Id: I0cef43fe14a22f85bc77f7937e5fdbeffcd7f95b
2011-09-14 00:22:51 +01:00
Ed Heyl 58febb10e2 GWK74
Change-Id: Iaeb2ade7b4f6d964ba70f1e9ed8cf9e369db16a3
2011-09-13 11:35:44 -07:00
Scott Main 2b2f3b9400 Merge "cherrypick from Change-Id: I2722879ee7f246e34acca7fd9fb84acff4e8540d docs: some css for android u and javascript" 2011-09-13 09:45:57 -07:00
Scott Main 629b0f00d3 cherrypick from Change-Id: I2722879ee7f246e34acca7fd9fb84acff4e8540d
docs: some css for android u
and javascript

Change-Id: Idb897999eb9c88823ebab418ca5386bca77ca969
2011-09-13 09:43:16 -07:00
The Android Automerger a164a91247 GWK73
Change-Id: Ibe4ffed6b257a075bf2665b43b3f064006524ee1
2011-09-12 17:17:34 -07:00
The Android Automerger 7638ed6db1 keep history after reconcile of gingerbread-release 2011-09-12 17:16:28 -07:00
The Android Automerger 4da9cdc316 HLK73B 2011-09-12 09:58:42 -07:00
Ying Wang 81258469cf Merge "Move forward installed-files.txt in the dependency graph" 2011-09-12 09:31:24 -07:00
The Android Open Source Project efb1b49ec1 Reconcile with gingerbread-release honeycomb-LTE-release
Change-Id: Ia10c7b3cda1b663ac65937929bf2c8e24539b75a
2011-09-12 07:46:46 -07:00
The Android Automerger e342fce94a HLK73 2011-09-11 16:46:55 -07:00
Ed Heyl f440fc15fe update platform version
update build id

Change-Id: I3a07e62b50744b7567fd4ba435f2a8528a2f6008
2011-09-11 11:46:10 -07:00
android-merger 393313197b fix space
Change-Id: I29601b2fd5ec607868374e222031598835549854
2011-09-09 20:17:36 -07:00
android-merger d1eae12fc1 GRK71 again
Change-Id: I4ad2c1583e83f1208ca1c519ea1c03352f335e61
2011-09-09 18:37:23 -07:00
Ying Wang e5e8c5f218 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
2011-09-09 17:07:23 -07:00
android-merger b5d4684223 GRK71 again
Change-Id: Ib5f68df8ad7022dd0760f38e72c8fc3840be92b4
2011-09-09 16:49:33 -07:00
android-merger 3092affa4d GRK71
Change-Id: Ia00607e866b1ce3633eb0cc6051c5a9d70bea7f5
2011-09-09 14:50:09 -07:00
The Android Automerger b6b8ae8f12 HLK71 2011-09-09 13:04:43 -07:00
The Android Open Source Project 44145f5b7e Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I0f44d27ec2e8b99f45ee059d78cae7cceb41931e
2011-09-09 12:29:25 -07:00
Brian Muramatsu 6824d81a00 am ae55f41c: am 89ba0f7e: am 1615c2fc: Rename generic_arm5 to generic_armv5
* commit 'ae55f41c5d74b1aa58ef5015c613541e77f55034':
  Rename generic_arm5 to generic_armv5
2011-09-09 12:04:29 -07:00
Brian Muramatsu 164285e05f am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '8658fa51d15290cf43178d0633b53f11ff08a4aa':
  Disable Dexpreopt for generic_arm5
2011-09-09 12:04:27 -07:00
Brian Muramatsu c5c2865751 am 5d16ff13: am 372a1e0b: am 31e27eeb: generic_arm5 product
* commit '5d16ff13d7c6c3da38ba29a412d535221cee7a60':
  generic_arm5 product
2011-09-09 12:04:25 -07:00
Jean-Baptiste Queru d365904436 Reconcile with honeycomb-LTE-release
Change-Id: I8a0b1dbf38c17488d6948035158fbd720df062c3
2011-09-09 05:44:59 -07:00
Ying Wang 8e5b540cff am 41346ae4: am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp
* commit '41346ae4077c7dee66a7c04dc91714569dca9303':
  Allow uninstallable APPs.
2011-09-08 14:48:38 -07:00
Ying Wang d62de0f884 Merge "Provide LOCAL_RENDERSCRIPT_TARGET_API override." 2011-09-08 14:26:28 -07:00
Ying Wang f1054bf22e Merge "Discard hidden files when rounding up resource." 2011-09-08 14:16:23 -07:00
Doug Zongker c29dfcad75 Merge "save uid/gid/mode information of boot and recovery files" 2011-09-08 12:04:27 -07:00
Brian Muramatsu ae55f41c5d am 89ba0f7e: am 1615c2fc: Rename generic_arm5 to generic_armv5
* commit '89ba0f7e62e94fbe010bcf9aab3e1be035ffb44a':
  Rename generic_arm5 to generic_armv5
2011-09-08 11:15:38 -07:00
Brian Muramatsu 89ba0f7e62 am 1615c2fc: Rename generic_arm5 to generic_armv5
* commit '1615c2fcb60c7164cd8629e8c78cef551ebd329a':
  Rename generic_arm5 to generic_armv5
2011-09-08 11:13:50 -07:00
Brian Muramatsu 1615c2fcb6 Rename generic_arm5 to generic_armv5
Bug 5267392

Change-Id: I5129d5ba283e711a2cb5840fc0c9b707f653936a
2011-09-08 10:36:53 -07:00
Brian Muramatsu 8658fa51d1 am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '9d014e6570deb3861b503833823e56e1c589626c':
  Disable Dexpreopt for generic_arm5
2011-09-08 10:26:29 -07:00
Brian Muramatsu 9d014e6570 am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '9353a3be5fca8a83c3a60e890fbca323f9fb0e04':
  Disable Dexpreopt for generic_arm5
2011-09-08 10:24:14 -07:00
Raphael 9b73fdabc4 Merge "Enable 'make traceview' under Windows." 2011-09-08 10:16:44 -07:00
Brian Muramatsu d47da70817 am 3eae5b7c: am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build
* commit '3eae5b7c1b3197bed4c883a671cfea9d5d9570bf':
  Use package.apk.unaligned in CTS Build
2011-09-08 10:08:27 -07:00
Brian Muramatsu 9353a3be5f 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
2011-09-07 18:12:22 -07:00
Brian Muramatsu 5d16ff13d7 am 372a1e0b: am 31e27eeb: generic_arm5 product
* commit '372a1e0ba362ba509d44a1ed4b8eb554b1da7180':
  generic_arm5 product
2011-09-07 17:13:30 -07:00
Brian Muramatsu 372a1e0ba3 am 31e27eeb: generic_arm5 product
* commit '31e27eebc3108d788d040228e5143df3e87b1424':
  generic_arm5 product
2011-09-07 17:12:16 -07:00