Commit Graph

6329 Commits

Author SHA1 Message Date
The Android Open Source Project
abaf3d6bbd Reconcile with ics-factoryrom-release
Change-Id: I849876516cfa315f96ac984b52fc6dc21e053577
2011-09-19 08:00:33 -07:00
The Android Automerger
ccbd70942d IFK81 2011-09-19 06:29:30 -07:00
The Android Automerger
6c745749be merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-19 06:27:07 -07:00
The Android Automerger
7d22638c86 IFK80D 2011-09-18 20:47:20 -07:00
The Android Automerger
9699caaac7 IFK80C 2011-09-18 19:30:25 -07:00
The Android Automerger
a3a6bc3de3 IFK80B 2011-09-18 15:26:05 -07:00
The Android Automerger
c075c1d6d6 IFK80 2011-09-18 06:30:47 -07:00
The Android Automerger
9275c68b64 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-18 06:27:16 -07:00
The Android Automerger
92375d7ca1 IFK77E 2011-09-17 08:17:40 -07:00
The Android Automerger
0720d88673 IFK77D 2011-09-16 17:18:03 -07:00
The Android Open Source Project
d202637c94 Reconcile with ics-factoryrom-release
Change-Id: I95804a1a46496e2ba9336831eaeac9ae58d12d17
2011-09-16 12:52:53 -07:00
Raphael
cf29731eea Merge "Don't strip llvm-rs-rc in core/Makefile" 2011-09-16 12:25:07 -07:00
Raphael
aae801fb1c Merge "Enable building sdk/avdlauncher in the Win SDK." 2011-09-16 10:59:41 -07:00
Raphael
c36df7b12b Enable building sdk/avdlauncher in the Win SDK.
Required by Change-Id Ic651e3c3 in sdk.git

Change-Id: I97f389d052ba9abf1c40547abbc6d7c164bdf405
2011-09-16 09:20:03 -07:00
Raphael
daae8c7656 Merge "Add rm and strip abilities to atree." 2011-09-16 09:11:58 -07:00
The Android Automerger
3188a56cd7 IFK77C 2011-09-15 17:55:40 -07:00
The Android Automerger
bc4abd817a IFK77B 2011-09-15 14:36:27 -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
Raphael
469bbdf8c3 Don't strip llvm-rs-rc in core/Makefile
This is done in development/build/sdk.atree now.

Change-Id: I2cd8e42192439851e1e42070cf74e6ee7c02ba59
2011-09-15 11:22:28 -07:00
Raphael
0b3ec5d32f Add rm and strip abilities to atree.
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.

Change-Id: I22aae7a87c36c082e1aab87132099a3c644914da
2011-09-15 11:22:16 -07:00
Ed Heyl
f38cdf8585 correct branch id to 'IF'
Change-Id: I7fd338f355511869559cc5b407b82e77dc3425ed
2011-09-15 09:44:04 -07:00
Ed Heyl
ef378cf590 IPK77
Change-Id: I3bc35f1705a33b34119a350b84ff54dc19a89da3
2011-09-15 07:00:42 -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