OSDN Git Service
Ying Wang [Fri, 6 Jan 2012 19:59:30 +0000 (11:59 -0800)]
Include toolchain makefile based on the current config.
So we can have the same set of module names in different host arch
/ toolchain version combinations.
Change-Id: Iec66584bf3de92aedd71a59f9dbe74b6ed025b2e
Steve Block [Thu, 5 Jan 2012 23:28:01 +0000 (23:28 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug:
5449033
Change-Id: I817c12b1e97bee598097d02c70d509f7ab70576a
Steve Block [Thu, 5 Jan 2012 22:08:39 +0000 (14:08 -0800)]
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
Jeff Davidson [Thu, 5 Jan 2012 20:58:04 +0000 (12:58 -0800)]
Add hm/hmm/hmmm command.
Everyone always mixes up m/mm/mmm and may not know about the "help"
command; this seems to be a nice way to remind yourself. :)
Change-Id: I009c7f7891768a8605c06e8d16384a812e607438
The Android Open Source Project [Thu, 5 Jan 2012 20:08:33 +0000 (12:08 -0800)]
am
943f9a58: Reconcile with ics-mr1-release
* commit '
943f9a58a3eb3240c8a85efa49a25a77282f5d48':
IMM04
Al Sutton [Thu, 5 Jan 2012 20:08:29 +0000 (12:08 -0800)]
am
1964c8ed: am
d8765f0f: am
80cfc37d: Partial fix for emulator under Lion.
* commit '
1964c8ed2d6b1981ee991b5ecd95ab711affdf62':
Partial fix for emulator under Lion.
Ed Heyl [Thu, 5 Jan 2012 20:08:27 +0000 (12:08 -0800)]
am
6a203293: Merge commit \'
9a46327e\' into ics-mr1-plus-aosp
* commit '
6a203293681df031b6a47f2f189d4d9d44d18576':
increment version to 4.0.4
The Android Open Source Project [Thu, 5 Jan 2012 15:45:15 +0000 (07:45 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iaa3637a3db5b9f2c8c4721a8ea2cb230336753f5
Al Sutton [Thu, 5 Jan 2012 04:41:53 +0000 (20:41 -0800)]
am
d8765f0f: am
80cfc37d: Partial fix for emulator under Lion.
* commit '
d8765f0f843e78c691c77264619125954d710b1a':
Partial fix for emulator under Lion.
Al Sutton [Thu, 5 Jan 2012 04:40:35 +0000 (20:40 -0800)]
am
80cfc37d: Partial fix for emulator under Lion.
* commit '
80cfc37d0f0ddbb7db09b7662b84e816ab409537':
Partial fix for emulator under Lion.
The Android Automerger [Thu, 5 Jan 2012 00:45:21 +0000 (16:45 -0800)]
IMM04
Ed Heyl [Thu, 5 Jan 2012 00:42:14 +0000 (16:42 -0800)]
Merge commit '
9a46327e' into ics-mr1-plus-aosp
The Android Automerger [Thu, 5 Jan 2012 00:41:01 +0000 (16:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ed Heyl [Thu, 5 Jan 2012 00:34:18 +0000 (16:34 -0800)]
increment version to 4.0.4
Change-Id: I156516aedb714f589bd0ae2d39bc9e273b775276
Al Sutton [Wed, 4 Jan 2012 23:16:50 +0000 (15:16 -0800)]
Partial fix for emulator under Lion.
Don't use -Wl,-dynamic on Lion
Steve Block [Wed, 4 Jan 2012 20:07:45 +0000 (20:07 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug:
5449033
Change-Id: I02566a8d55d7f8845bcc11925b90b2dac4342e63
Steve Block [Tue, 20 Dec 2011 16:25:43 +0000 (16:25 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug:
5449033
Change-Id: I9281fd27af8c6ec29ebdca60b22f6c9d5ff8deed
Ying Wang [Tue, 3 Jan 2012 19:52:26 +0000 (11:52 -0800)]
Default LOCAL_SDK_RES_VERSION to LOCAL_SDK_VERSION
in static_java_library.mk.
Change-Id: I25ad47fea0fdb10c8aa0a0cb0d4c5ed117cd76ef
Jean-Baptiste Queru [Wed, 28 Dec 2011 23:42:40 +0000 (15:42 -0800)]
Add CSR to the list of known vendors
Change-Id: I978569e1be4c9d1d52d2b7fb7de2da4d4f616f39
Conley Owens [Tue, 27 Dec 2011 18:28:10 +0000 (10:28 -0800)]
am
f3c068db: (-s ours) am
d38c870d: Get build system to work with Make 3.82
* commit '
f3c068db26fd1c862f06423714aadf75bf45136b':
Get build system to work with Make 3.82
Ying Wang [Fri, 23 Dec 2011 01:40:05 +0000 (17:40 -0800)]
Remove the restriction that PHONY_PACKAGE needs LOCAL_REQUIRED_MODULES
Change-Id: I33e776ea80368e0f0290169e680689a680186ed6
Conley Owens [Fri, 23 Dec 2011 00:52:42 +0000 (16:52 -0800)]
am
d38c870d: Get build system to work with Make 3.82
* commit '
d38c870d2e168b051692b20ade0fc966c9e2daf7':
Get build system to work with Make 3.82
Conley Owens [Thu, 22 Dec 2011 17:46:19 +0000 (09:46 -0800)]
Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.
Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
Conley Owens [Thu, 22 Dec 2011 23:14:01 +0000 (15:14 -0800)]
Merge "Get build system to work with Make 3.82"
Tor Norbye [Thu, 22 Dec 2011 20:13:15 +0000 (12:13 -0800)]
Merge "Make asm-3.1 an optional module, remove from grandfathered list"
Conley Owens [Thu, 22 Dec 2011 17:46:19 +0000 (09:46 -0800)]
Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.
Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
Ying Wang [Thu, 22 Dec 2011 02:54:36 +0000 (18:54 -0800)]
We should include factory ramdisk if one shot makefile is NOT defined.
Change-Id: I711dbfb0d98a5e8a4d784d3ee6f3f9cfdc926209
Al Sutton [Thu, 22 Dec 2011 00:46:37 +0000 (16:46 -0800)]
am
657aeac8: am
9ce06f11: Don\'t run ranlib on MacOS 10.7
* commit '
657aeac8423d9e3cd31c0dffcecaad78a53d7604':
Don't run ranlib on MacOS 10.7
Atte Peltomaki [Thu, 22 Dec 2011 00:46:36 +0000 (16:46 -0800)]
am
05e98055: am
60fe963c: build: explicitly define dependency files
* commit '
05e98055fdb1d48bac80790cb719838598b687e8':
build: explicitly define dependency files
Al Sutton [Thu, 22 Dec 2011 00:45:21 +0000 (16:45 -0800)]
am
9ce06f11: Don\'t run ranlib on MacOS 10.7
* commit '
9ce06f11d69f5154843c234fe0624f9e70d39359':
Don't run ranlib on MacOS 10.7
Atte Peltomaki [Thu, 22 Dec 2011 00:45:20 +0000 (16:45 -0800)]
am
60fe963c: build: explicitly define dependency files
* commit '
60fe963c63c1b98255ad1cf40573b81b5d90d9c3':
build: explicitly define dependency files
Ying Wang [Thu, 22 Dec 2011 00:24:43 +0000 (16:24 -0800)]
Merge "Disable factory ramdisk if build with mm/mmm"
Ying Wang [Thu, 22 Dec 2011 00:20:12 +0000 (16:20 -0800)]
Disable factory ramdisk if build with mm/mmm
Because factory ramdisk build depends on the global view of all modules.
Change-Id: I5b35821cd287b70702191f3c30be6735d3339544
Raphael [Wed, 21 Dec 2011 23:02:44 +0000 (15:02 -0800)]
Merge "Allow make 3.82 to be used under Cygwin 1.7"
Raphael [Wed, 21 Dec 2011 23:02:38 +0000 (15:02 -0800)]
Merge "Add 2 SDK directories that can build under Cygwin/Mingw"
Ying Wang [Wed, 21 Dec 2011 19:30:59 +0000 (11:30 -0800)]
Fix multiple modules with the same name in FACTORY_RAMDISK_MODULES
With this change, if a module name is associated with multiple modules,
you can specify multiple install paths in
PRODUCT_FACTORY_RAMDISK_MODULES.
For example, if we have 2 modules named "foo", one is Java library and
the other is executable, then you can write:
PRODUCT_FACTORY_RAMDISK_MODULES += \
foo:system/bin/foo:system/framework/foo.jar
Or:
PRODUCT_FACTORY_RAMDISK_MODULES += \
foo:system/bin/foo \
foo:system/framework/foo.jar
The build system will choose the correct built files based on the
install paths.
Change-Id: I6efc72e8abd1e81710ada16731b6792989aefd85
Al Sutton [Wed, 21 Dec 2011 21:12:05 +0000 (13:12 -0800)]
Don't run ranlib on MacOS 10.7
Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
Atte Peltomaki [Wed, 21 Dec 2011 17:24:09 +0000 (09:24 -0800)]
build: explicitly define dependency files
Groundwork for distcc support in Android build system,
see distcc FAQ for details on why -MF is needed:
http://distcc.googlecode.com/svn/trunk/doc/web/faq.html
The Android Open Source Project [Wed, 21 Dec 2011 15:21:38 +0000 (07:21 -0800)]
am
a4b72c9f: Reconcile with ics-mr1-release
* commit '
a4b72c9fe4ea6e984440d67538eee26fdb140d8d':
IML81
The Android Open Source Project [Wed, 21 Dec 2011 15:19:13 +0000 (07:19 -0800)]
Reconcile with ics-mr1-release
Change-Id: Idb5f4da7a973995eafb7233d864c0cf379e35db7
Ying Wang [Wed, 21 Dec 2011 01:36:42 +0000 (17:36 -0800)]
Merge "Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES"
Ying Wang [Wed, 21 Dec 2011 01:25:31 +0000 (17:25 -0800)]
Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES
If there is shared library with the same name.
Change-Id: Iaa43219cab7737c02a79d168f13ad4c473421f24
The Android Automerger [Wed, 21 Dec 2011 01:29:41 +0000 (17:29 -0800)]
IML81
The Android Automerger [Wed, 21 Dec 2011 01:26:02 +0000 (17:26 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 20 Dec 2011 21:09:52 +0000 (13:09 -0800)]
am
b08c5647: Reconcile with ics-mr1-release
* commit '
b08c5647a42d07d905823ccf2a88a3a8051af006':
IML77B
IML77
The Android Open Source Project [Tue, 20 Dec 2011 21:08:24 +0000 (13:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3624715f06ac682520676b2e6d45a29e1d20b1d9
Raphael [Mon, 19 Dec 2011 21:37:55 +0000 (13:37 -0800)]
Allow make 3.82 to be used under Cygwin 1.7
OTOH, should we just allow the expression to be >= 3.81
for all platforms? For cygwin it's a specific case since
we don't build the platform, only a handful set of tools
and it works just fine with a newer make 3.82.
Change-Id: Icff0d0e13bce79f7164007985f14db56e9049552
Raphael [Mon, 19 Dec 2011 21:27:11 +0000 (13:27 -0800)]
Add 2 SDK directories that can build under Cygwin/Mingw
Change-Id: I020c2691d7d92a48bd406360e2752357ae79e3b0
Bruce Beare [Mon, 19 Dec 2011 19:38:37 +0000 (11:38 -0800)]
am
b056d71f: If setupwizard is disabled, don\'t force it to optional
* commit '
b056d71f79b717fb36d375e48c19509900f977d3':
If setupwizard is disabled, don't force it to optional
Bruce Beare [Thu, 1 Dec 2011 20:46:12 +0000 (12:46 -0800)]
If setupwizard is disabled, don't force it to optional
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Glenn Kasten [Mon, 19 Dec 2011 16:07:56 +0000 (08:07 -0800)]
Merge "Add libaudioutils"
The Android Automerger [Sun, 18 Dec 2011 01:30:21 +0000 (17:30 -0800)]
IML77B
Ying Wang [Sat, 17 Dec 2011 01:00:46 +0000 (17:00 -0800)]
Merge "Collect the GPL source files."
Glenn Kasten [Fri, 16 Dec 2011 23:34:57 +0000 (15:34 -0800)]
Add libaudioutils
Change-Id: I8fe062e4a78d8db1ce0612bf7cb58dc021925810
Ying Wang [Fri, 16 Dec 2011 19:27:52 +0000 (11:27 -0800)]
Support to build factory ramdisk image.
Bug:
5769921
With this change, to build factory_ramdisk.img, set
PRODUCT_FACTORY_RAMDISK_MODULES in your product config.
PRODUCT_FACTORY_RAMDISK_MODULES consists of
"<module_name>:<install_path>" pairs.
<install_path> is relative to the root of the factory ramdisk output.
For example:
PRODUCT_FACTORY_RAMDISK_MODULES := \
toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb
On the other hand you can use PRODUCT_COPY_FILES to copy prebuilt files
to the factory ramdisk.
Or you can define modules that are specific for the factory ramdisk
(with LOCAL_MODULE_PATH pointing to TARGET_FACTORY_RAMDISK_OUT) and add
the module names to PRODUCT_PACKAGES.
Change-Id: I80ff72606415cd74fe6f3bc93020a05d84e45b70
Ying Wang [Fri, 16 Dec 2011 21:52:26 +0000 (13:52 -0800)]
Merge "Print out ignored PRODUCT_COPY_FILES"
Brian Muramatsu [Fri, 16 Dec 2011 21:07:15 +0000 (13:07 -0800)]
Stop Building CTS VM Tests
Bug
5728172
The VM tests were used with the old test runner.
Change-Id: I7ba819a394bb9643f937240ebd315d7d7820a8bf
The Android Automerger [Fri, 16 Dec 2011 20:02:53 +0000 (12:02 -0800)]
IML77
The Android Automerger [Fri, 16 Dec 2011 20:01:24 +0000 (12:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ying Wang [Fri, 16 Dec 2011 19:54:25 +0000 (11:54 -0800)]
Print out ignored PRODUCT_COPY_FILES
So that people know their files are not really copied in accident.
Change-Id: I8fab920483230a9f349304dcbdb2fb9d60ee0215
Kenny Root [Fri, 16 Dec 2011 17:27:16 +0000 (09:27 -0800)]
Merge "Unset HAVE_TLS_REGISTER for ARMv5"
The Android Open Source Project [Fri, 16 Dec 2011 16:09:52 +0000 (08:09 -0800)]
am
6c2c5d8e: Reconcile with ics-mr1-release
* commit '
6c2c5d8eec5e140ebedee7330988015df6aeb8bc':
IML74K
IML74J
IML74I
IML74H
IML75
The Android Open Source Project [Fri, 16 Dec 2011 16:07:59 +0000 (08:07 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4efd2763f8ae4da60277edc110ff8649869a35e7
The Android Automerger [Fri, 16 Dec 2011 08:15:10 +0000 (00:15 -0800)]
IML74K
The Android Automerger [Fri, 16 Dec 2011 05:43:32 +0000 (21:43 -0800)]
IML74J
The Android Automerger [Fri, 16 Dec 2011 04:50:23 +0000 (20:50 -0800)]
IML74I
The Android Automerger [Fri, 16 Dec 2011 04:49:52 +0000 (20:49 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 16 Dec 2011 04:18:19 +0000 (20:18 -0800)]
IML74H
Scott Main [Fri, 16 Dec 2011 04:12:50 +0000 (20:12 -0800)]
am
96f696d9: am
c4e8801c: am
50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
* commit '
96f696d90176b53c6902455b270960dd88ca1c1a':
docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
Scott Main [Fri, 16 Dec 2011 04:10:46 +0000 (20:10 -0800)]
am
c4e8801c: am
50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
* commit '
c4e8801c2d059aa68e59069c5cc03adb2d464e6b':
docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
Scott Main [Fri, 16 Dec 2011 04:09:04 +0000 (20:09 -0800)]
am
50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
* commit '
50d6f97c46934014894a43d3610029f579145713':
docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
Scott Main [Fri, 16 Dec 2011 04:06:32 +0000 (20:06 -0800)]
docs: revise space wrapping to avoid "new" tags from breaking new lines alone
Temp fix
Change-Id: If99ce3442ec179a46fe3bbe0a06f690527d05eb5
Scott Main [Fri, 16 Dec 2011 03:18:24 +0000 (19:18 -0800)]
am
a9255cfa: am
0af80fb4: am
0f429ebe: docs: fix bug in script for tab cookies
* commit '
a9255cfa7c4b352b730ade2ea5cf3096f9512845':
docs: fix bug in script for tab cookies
Scott Main [Fri, 16 Dec 2011 03:16:13 +0000 (19:16 -0800)]
am
0af80fb4: am
0f429ebe: docs: fix bug in script for tab cookies
* commit '
0af80fb409708d86b360e842bc834b3cbe4bc443':
docs: fix bug in script for tab cookies
Scott Main [Fri, 16 Dec 2011 03:14:31 +0000 (19:14 -0800)]
am
0f429ebe: docs: fix bug in script for tab cookies
* commit '
0f429ebe63acbf8ccc1efe3c4185151eb15a4783':
docs: fix bug in script for tab cookies
Scott Main [Fri, 16 Dec 2011 03:12:17 +0000 (19:12 -0800)]
docs: fix bug in script for tab cookies
Change-Id: I09a49764f66673b3f55032158efd44c228832e8f
Scott Main [Fri, 16 Dec 2011 01:41:49 +0000 (17:41 -0800)]
am
b90afc2c: am
9839afdd: am
1d42360a: docs: style and script changes for android u classes
* commit '
b90afc2cf008fac3f63e721de7ef0a64f8e815b1':
docs: style and script changes for android u classes
Scott Main [Fri, 16 Dec 2011 01:39:41 +0000 (17:39 -0800)]
am
9839afdd: am
1d42360a: docs: style and script changes for android u classes
* commit '
9839afddfcade4db1989718216b592aed76e73e7':
docs: style and script changes for android u classes
Scott Main [Fri, 16 Dec 2011 01:37:35 +0000 (17:37 -0800)]
am
1d42360a: docs: style and script changes for android u classes
* commit '
1d42360a028b2d55f6d4d29bd99e8ef3de6e8402':
docs: style and script changes for android u classes
Scott Main [Fri, 16 Dec 2011 01:34:40 +0000 (17:34 -0800)]
docs: style and script changes for android u classes
Change-Id: I5866541bb9dd41329aa02328b805959c8f675f8c
Ying Wang [Fri, 16 Dec 2011 00:36:55 +0000 (16:36 -0800)]
Remove the R/Manifest classes when building the static Java library
Bug:
5448433
Instead of deferring the removal to building the app.
In that case any R/Manifest classes in any static Java libraries will be
deleted, no matter if they are generated from Android resource, or just
source R.java/Manifest.java in the source tree by accident.
Change-Id: I656f45e3cbc3796c5d4832363231480b3f1dc5b8
Ying Wang [Thu, 15 Dec 2011 23:10:04 +0000 (15:10 -0800)]
Don't remove R class to fix the build.
Unfortunately there is R.java checked in the source tree that gets built
into static library.
So we have to find a way to delete classes from R.java generated by the
build system on the fly.
Change-Id: I2d82d28234cecbf6dd5b02b2dd4f7dbd47e3b626
Ying Wang [Thu, 15 Dec 2011 22:34:32 +0000 (14:34 -0800)]
Merge "Support to build static Java library with Android resource"
Conley Owens [Thu, 15 Dec 2011 18:57:32 +0000 (10:57 -0800)]
Merge "Add several module owners to the whitelist"
Kenny Root [Thu, 15 Dec 2011 18:30:13 +0000 (10:30 -0800)]
Unset HAVE_TLS_REGISTER for ARMv5
Bug:
5763261
Change-Id: I0394daa4cdbad598b91a99e54ca5f830e9ee940b
Conley Owens [Thu, 15 Dec 2011 18:24:26 +0000 (10:24 -0800)]
Add several module owners to the whitelist
Change-Id: I9a215b74167efc2a6b3070dc8b616a289669d10f
The Android Automerger [Thu, 15 Dec 2011 06:16:29 +0000 (22:16 -0800)]
IML75
The Android Automerger [Thu, 15 Dec 2011 06:13:33 +0000 (22:13 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 15 Dec 2011 03:58:49 +0000 (19:58 -0800)]
am
c7185534: Reconcile with ics-mr1-release
* commit '
c7185534d323aa13af3bda77a2e0e232306be89a':
IML74G
The Android Open Source Project [Thu, 15 Dec 2011 03:57:24 +0000 (19:57 -0800)]
Reconcile with ics-mr1-release
Change-Id: I13575fbc40df854f574e7eaf8cfee6153ab3a342
The Android Automerger [Thu, 15 Dec 2011 03:28:43 +0000 (19:28 -0800)]
IML74G
The Android Open Source Project [Thu, 15 Dec 2011 00:06:54 +0000 (16:06 -0800)]
am
efe3034c: Reconcile with ics-mr1-release
* commit '
efe3034c7107f80e99016bf1808cdfe1afe03e31':
IML74F
IML74E
The Android Open Source Project [Thu, 15 Dec 2011 00:05:28 +0000 (16:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: I93d6301506cdc1b3f549b7cf4dbc8a8b3adeca2b
Ying Wang [Wed, 14 Dec 2011 22:29:28 +0000 (14:29 -0800)]
Support to build static Java library with Android resource
Bug:
5714516
The rationale behind this change:
- the library is compiled into a jar file, but its R class is generated
making the constant not constant (static, not final static) (aapt
option --non-constant-id). Also the jar file does not contain the R
class.
- this allows the integer value to not be inlined in the compiled
class files. Note that this prevents using switch statements.
- the main project use this jar file as a normal static library: it will
add all the class files except the R.class.
- the main project uses the library res folder as a resource
folder with lower priority than the main project (basically the
main project is an overlay. This is accomplished using aapt's
--auto-add-overlay to handle resources only in the main project
(which the normal overlay mechanism doesn't allow).
- the main project creates R classes in the main project's
package but also in the library's package. This is done with
aapt's --extra-packages which accept as many packages as
needed, separated by a :.
- manifest merging is not done yet, so
activities/services/permissions/etc... have to be manually declared in
the main app.
To use a static library with Android resource in your app,
1. Add the library's resource dir to your app as an overlay:
LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs>
2. Set the proper aapt flags:
LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \
--extra-packages <lib1_package_name>:<lib2_package_name>:...
Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
The Android Automerger [Wed, 14 Dec 2011 23:56:03 +0000 (15:56 -0800)]
IML74F
The Android Automerger [Wed, 14 Dec 2011 23:44:48 +0000 (15:44 -0800)]
IML74E
Brian Muramatsu [Wed, 14 Dec 2011 23:39:46 +0000 (15:39 -0800)]
resolved conflicts for merge of
80fa947b to master
Change-Id: I0febb15b690932ad342da4b10eb9c0f13d1d1517
Brian Muramatsu [Wed, 14 Dec 2011 23:33:22 +0000 (15:33 -0800)]
am
fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1
* commit '
fea66cee1cd661b6bf8ead1988cf008fa61b01a7':
Build Support for CTS Native Tests
Brian Muramatsu [Wed, 14 Dec 2011 23:31:35 +0000 (15:31 -0800)]
Merge "Build Support for CTS Native Tests" into ics-mr1
David 'Digit' Turner [Tue, 13 Dec 2011 16:21:56 +0000 (17:21 +0100)]
x86: Refine the way we configure the x86 build.
This is the result of a recent conversation around the x86 ABI
and its relationship with how we build platform images. Briefly:
- We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE
instead of relying on explicit compiler macros like -DUSE_$FEATURE
- We want to allow for other x86-based arch variants, e.g. if
someone wants to build Android for a CPU that doesn't support
the NDK x86 ABI. However, we need to ensure these are not
tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk)
- There are several flags which use is dubious now that we have
a dedicated toolchain to build all the x86 stuff. Comment them
as 'to be considered for removal'. We'll do the proper checks
later.
Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58