Ying Wang
43e18e0d7b
Install path support for vendor modules.
...
Bug: 5284764
Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor
partition.
Change-Id: I9acdda6b2ff3142628b9849ea534b3ec288545a0
2011-09-21 13:32:36 -07:00
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
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
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
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
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
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
Ying Wang
d9020c2e9a
Add ABI specific include path for NDK.
...
Change-Id: I37a935126b9a1e544fc5a7471cf6ca224fc89cf3
2011-09-07 14:31:47 -07:00
Doug Zongker
23f8bde52d
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
2011-09-07 14:11:51 -07:00
Ying Wang
41346ae407
am ba35b2d6
: resolved conflicts for merge of 162991be
to gingerbread-plus-aosp
...
* commit 'ba35b2d61531a071533891307904e6ad7f81fb65':
Allow uninstallable APPs.
2011-09-07 11:25:42 -07:00
Ying Wang
ba35b2d615
resolved conflicts for merge of 162991be
to gingerbread-plus-aosp
...
Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5
2011-09-07 11:20:28 -07:00
Ying Wang
162991beb5
Allow uninstallable APPs.
...
Bug: 5264671
This is needed by cts tests.
It's harmless to existing modules.
Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
2011-09-07 10:32:39 -07:00
Raphael
1518506345
Enable 'make traceview' under Windows.
...
Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
2011-09-06 16:39:37 -07:00
Justin Ho
0f2e55e47d
Merge "Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug: 5032006"
2011-09-06 13:18:22 -07:00
Justin Ho
0279b62d16
Updated dex-preopt BOOTCLASSPATH with values from init.rc
...
Bug: 5032006
Change-Id: I6ed7e55ec2b278c0d60ad4e17208480d05af61bc
2011-09-06 13:04:36 -07:00
Doug Zongker
e1a8e3aef3
allow setting LOCAL_STRIP_MODULE on multi_prebuilts
...
Change-Id: I4a58255381ba8a50d8f9512bf9892f5050599393
2011-09-06 10:31:37 -07:00
Brian Muramatsu
3eae5b7c1b
am 08b8e002
: am 2306106d
: Use package.apk.unaligned in CTS Build
...
* commit '08b8e0024812ea907cf3938bcd07b8dca6188eaf':
Use package.apk.unaligned in CTS Build
2011-09-02 16:56:07 -07:00
Brian Muramatsu
08b8e00248
am 2306106d
: Use package.apk.unaligned in CTS Build
...
* commit '2306106d3e2cd774ef0b2cd782442f90c402341f':
Use package.apk.unaligned in CTS Build
2011-09-02 16:53:43 -07:00
Brian Muramatsu
2306106d3e
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
2011-09-02 15:29:10 -07:00
Justin Ho
19b22a9413
Remove pinyinIME
...
Change-Id: If83419336294eb56d5b96384a7bc9d9821888b02
2011-09-02 08:00:53 -07:00
Justin Ho
bdab41a16f
Add image size calcuations into the script
...
Change-Id: Ide13a873982bae21e2b8735a235389a660abd592
2011-09-01 13:46:54 -07:00
Justin Ho
b139b6a1a5
Calculate system image size at build, for harvesting later
...
Change-Id: I6bfcde0e5df3f6da453f28354839e356f9191c0e
2011-08-31 16:29:31 -07:00
Justin Ho
17a27047bb
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
2011-08-30 14:29:18 -07:00
Stephen Hines
a941d137fa
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
2011-08-29 19:00:25 -07:00
Eino-Ville Talvala
5d8a5ceecb
Merge "Add filterfw.jar to standard list of java libraries to include."
2011-08-29 15:12:04 -07:00
Ying Wang
45bee774eb
am a1b603a5
: am 4b398749
: am c5033a33
: Merge "x86: remove obsolete comments"
...
* commit 'a1b603a556e338d4899a62ea37810aff81ab7fa1':
x86: remove obsolete comments
2011-08-29 11:05:08 -07:00
David 'Digit' Turner
9a1dd17028
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
2011-08-29 11:04:47 -07:00
Eino-Ville Talvala
76a7d82fac
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
2011-08-26 14:22:57 -07:00
Ying Wang
a1b603a556
am 4b398749
: am c5033a33
: Merge "x86: remove obsolete comments"
...
* commit '4b3987498eb15dc654fe572aadf53396aac36479':
x86: remove obsolete comments
2011-08-26 12:12:48 -07:00
Ying Wang
4b3987498e
am c5033a33
: Merge "x86: remove obsolete comments"
...
* commit 'c5033a3357b824a8285da67357a0d289750f4a72':
x86: remove obsolete comments
2011-08-26 12:10:45 -07:00
Ying Wang
c5033a3357
Merge "x86: remove obsolete comments"
2011-08-26 10:41:16 -07:00
David 'Digit' Turner
9d99d7dfb8
resolved conflicts for merge of 6da54b6e
to master
...
Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
2011-08-26 00:53:34 +02:00
David 'Digit' Turner
3db43165b0
am 80d41e4b
: am a2cc9b22
: Merge "sdk: add DLL_EXTENSION as an atree variable"
...
* commit '80d41e4b7555aed399c7bd23647947d7eade3fe6':
sdk: add DLL_EXTENSION as an atree variable
2011-08-25 14:30:00 -07:00
David 'Digit' Turner
6da54b6e0e
resolved conflicts for merge of 7be88d00
to honeycomb-plus-aosp
...
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
2011-08-25 23:23:32 +02:00
David 'Digit' Turner
80d41e4b75
am a2cc9b22
: Merge "sdk: add DLL_EXTENSION as an atree variable"
...
* commit 'a2cc9b227ae01803dfc4bc1987071fd6eee08bb6':
sdk: add DLL_EXTENSION as an atree variable
2011-08-25 12:14:35 -07:00
David 'Digit' Turner
7be88d00bb
am 77c6261f
: Merge "emulator: Enable GLES emulation libraries"
...
* commit '77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
emulator: Enable GLES emulation libraries
2011-08-25 12:14:33 -07:00
Jean-Baptiste Queru
d7d096df71
Tighten the toolchain version check
...
Bug: 3076137
Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf
2011-08-25 11:29:54 -07:00