OSDN Git Service
Adam Lesinski [Wed, 5 Feb 2014 00:46:59 +0000 (00:46 +0000)]
Merge "Allow multiple asset directories in aapt" into klp-modular-dev
Adam Lesinski [Tue, 28 Jan 2014 00:08:28 +0000 (16:08 -0800)]
Allow multiple asset directories in aapt
AAPT already supports this.
Change-Id: I293c7543fb43b15eedf2162416da48915ce02db8
Justin Koh [Tue, 4 Feb 2014 00:26:43 +0000 (16:26 -0800)]
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.
Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
Noreen Tolland [Fri, 31 Jan 2014 23:13:24 +0000 (23:13 +0000)]
Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
Justin Mattson [Thu, 30 Jan 2014 23:30:08 +0000 (15:30 -0800)]
(DO NOT MERGE) Revert "Make libart the default runtime"
This reverts commit
08d410f53249c18d752f56a881ed2335403080d4.
Nick Vaccaro [Fri, 24 Jan 2014 18:19:21 +0000 (10:19 -0800)]
Add atrace for supporting systrace tool
Change-Id: I6504a447218a70b0d148c0b5802228fb28934a0a
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Colin Cross [Thu, 30 Jan 2014 00:59:55 +0000 (00:59 +0000)]
am
190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-dev
* commit '
190ebe94e1a3c18183fa1940e7599b4d6f70b470':
pdk: add android_common.jar
Colin Cross [Thu, 30 Jan 2014 00:53:55 +0000 (00:53 +0000)]
Merge "pdk: add android_common.jar" into klp-volantis-dev
Scott Main [Wed, 29 Jan 2014 20:17:05 +0000 (20:17 +0000)]
am
bb783f27: am
a6e8c6c1: am
f72e1846: am
c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
* commit '
bb783f27bd0de3fc25d47dd7b00df62ca9504f7a':
add 'get started' link to the bottom of class home pages
Scott Main [Wed, 29 Jan 2014 20:15:01 +0000 (20:15 +0000)]
am
a6e8c6c1: am
f72e1846: am
c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
* commit '
a6e8c6c1e0f659b3532bd86631104360b54016ea':
add 'get started' link to the bottom of class home pages
Scott Main [Wed, 29 Jan 2014 20:11:48 +0000 (20:11 +0000)]
am
f72e1846: am
c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
* commit '
f72e1846898ec07cedf301ac76875cfa9f1164bc':
add 'get started' link to the bottom of class home pages
Scott Main [Wed, 29 Jan 2014 20:08:49 +0000 (20:08 +0000)]
am
c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
* commit '
c9e142e62d60b39bb5bd3459358a16c00fc557f3':
add 'get started' link to the bottom of class home pages
Scott Main [Wed, 29 Jan 2014 20:07:13 +0000 (20:07 +0000)]
Merge "add 'get started' link to the bottom of class home pages" into klp-docs
Colin Cross [Wed, 29 Jan 2014 18:01:37 +0000 (10:01 -0800)]
pdk: add android_common.jar
Add android_common.jar to the pdk java libraries to allow partners
to build test apps against it.
Change-Id: I3f3c0f6ef086489aec293e10b0d707845b174655
Elliott Hughes [Wed, 29 Jan 2014 01:55:36 +0000 (01:55 +0000)]
am
833188c1: am
e7bd4f5c: am
472a4858: Merge "gtest needs -lpthread."
* commit '
833188c16ea5d2f12aa0108119c327d6cd31d4ea':
gtest needs -lpthread.
Elliott Hughes [Wed, 29 Jan 2014 01:53:14 +0000 (01:53 +0000)]
am
e7bd4f5c: am
472a4858: Merge "gtest needs -lpthread."
* commit '
e7bd4f5cdf5d1ac0c49d42ed41322f10e7f34f9b':
gtest needs -lpthread.
Elliott Hughes [Wed, 29 Jan 2014 01:50:34 +0000 (01:50 +0000)]
am
472a4858: Merge "gtest needs -lpthread."
* commit '
472a48585ec1cfb66c5716f85b0efdf528b29f5d':
gtest needs -lpthread.
Elliott Hughes [Wed, 29 Jan 2014 01:45:17 +0000 (01:45 +0000)]
Merge "gtest needs -lpthread."
Elliott Hughes [Wed, 29 Jan 2014 01:32:30 +0000 (17:32 -0800)]
gtest needs -lpthread.
Host gtests that don't use pthreads themselves need to be linked
against libpthread because gtest itself uses pthreads to ensure
thread-safety. (It can't know in advance whether the code under
test is going to spin up threads, so it has to be pessimistic.)
Change-Id: I14fb1098c163d7fe6ae9a9a0314acead4ec9383d
Brian Carlstrom [Wed, 29 Jan 2014 00:44:02 +0000 (00:44 +0000)]
am
be7575ec: am
cba215dd: am
d21197d5: Merge "Make libart the default runtime"
* commit '
be7575ecb1827784f83582847749aa59c664d29e':
Make libart the default runtime
Brian Carlstrom [Wed, 29 Jan 2014 00:41:31 +0000 (00:41 +0000)]
am
cba215dd: am
d21197d5: Merge "Make libart the default runtime"
* commit '
cba215dd3241ae62416800f8d97d114d8a6e1a9a':
Make libart the default runtime
Brian Carlstrom [Wed, 29 Jan 2014 00:39:45 +0000 (00:39 +0000)]
am
d21197d5: Merge "Make libart the default runtime"
* commit '
d21197d50caaa025bd823a004984a2820bb3c2e2':
Make libart the default runtime
Brian Carlstrom [Wed, 29 Jan 2014 00:32:23 +0000 (00:32 +0000)]
Merge "Make libart the default runtime"
Elliott Hughes [Tue, 28 Jan 2014 21:37:15 +0000 (21:37 +0000)]
am
f7784e46: am
1a0e8501: am
1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '
f7784e46170e90cb38ddbab15b7aa3a4a7e2d07d':
Fix KERNEL_HEADERS_ARCH for mips and x86.
Elliott Hughes [Tue, 28 Jan 2014 21:35:25 +0000 (21:35 +0000)]
am
1a0e8501: am
1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '
1a0e850141fe19e1f1d503822893b8d66c0bca69':
Fix KERNEL_HEADERS_ARCH for mips and x86.
Elliott Hughes [Tue, 28 Jan 2014 21:29:52 +0000 (21:29 +0000)]
am
1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '
1a731adf943bc716cc7b9c95b321db02ad7216db':
Fix KERNEL_HEADERS_ARCH for mips and x86.
Elliott Hughes [Tue, 28 Jan 2014 21:23:07 +0000 (21:23 +0000)]
Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
Elliott Hughes [Tue, 28 Jan 2014 21:07:55 +0000 (13:07 -0800)]
Fix KERNEL_HEADERS_ARCH for mips and x86.
arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64
use headers that work for both widths. So where arm/arm64 need to handle the
second architecture case specially, all we need to do for the others is
hard-code the name. (x86_64.mk already hard-codes x86; we need to change
x86.mk for the case where we're building the 32-bit binaries for a mixed
system. mips64.mk doesn't exist yet, but when it does, it'll hard-code
just plain "mips" too.)
Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
Brian Carlstrom [Tue, 28 Jan 2014 20:54:10 +0000 (20:54 +0000)]
am
dc5dd9b4: am
d3737d07: am
49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '
dc5dd9b47fe2a24410b3e70d320655f1b5455966':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
Brian Carlstrom [Tue, 28 Jan 2014 20:52:17 +0000 (20:52 +0000)]
am
d3737d07: am
49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '
d3737d07c8adb0848dcddb7df03d1e6b4378ab93':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
Brian Carlstrom [Tue, 28 Jan 2014 20:50:19 +0000 (20:50 +0000)]
am
49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '
49eb440980db6680ec08c48b416e37e937bf9003':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
Brian Carlstrom [Tue, 28 Jan 2014 20:45:32 +0000 (20:45 +0000)]
Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
Brian Carlstrom [Fri, 17 Jan 2014 07:25:27 +0000 (23:25 -0800)]
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
(cherry-picked from commit
cd337c71ee65b17529a67af34d4c0b2824a4f175)
Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
Brian Carlstrom [Fri, 17 Jan 2014 01:55:07 +0000 (17:55 -0800)]
Make libart the default runtime
Change-Id: I4394f2bdef6f1be36f0f17f3b42d3e62bc2245ef
Colin Cross [Tue, 28 Jan 2014 02:37:21 +0000 (02:37 +0000)]
am
cb1ad445: am
0d24616d: am
cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '
cb1ad445663d190e204330b596b52e4734d9dcf0':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 02:34:05 +0000 (02:34 +0000)]
am
0d24616d: am
cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '
0d24616dd1b29e016aaae86761574fd88d701b6d':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 02:31:18 +0000 (02:31 +0000)]
am
cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '
cdd1475834156b2e45b73ae86a949efa6c1215eb':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 02:25:45 +0000 (02:25 +0000)]
Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
Colin Cross [Tue, 28 Jan 2014 01:34:21 +0000 (17:34 -0800)]
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
To ease the transition between toolchains, allow a target to specify
a list of cflags that the toolchain does not support. These will be
filtered out of the cflags provided by the module.
Add TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector for the
aarch64 toolchain, it does not yet suport -fstack-protector.
Change-Id: I168d0c6f131326fad305ec86fad46e6a3e03295a
Elliott Hughes [Tue, 28 Jan 2014 00:59:15 +0000 (00:59 +0000)]
am
69c36ee7: am
4fbf23ef: am
0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '
69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
Remove libthread_db from the default include path.
Elliott Hughes [Tue, 28 Jan 2014 00:54:33 +0000 (00:54 +0000)]
am
4fbf23ef: am
0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '
4fbf23ef8267849ce88217a256b394de3904a4f6':
Remove libthread_db from the default include path.
Elliott Hughes [Tue, 28 Jan 2014 00:43:29 +0000 (00:43 +0000)]
am
0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '
0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
Remove libthread_db from the default include path.
Ying Wang [Tue, 28 Jan 2014 00:08:19 +0000 (00:08 +0000)]
am
a8d15474: am
04cff708: resolved conflicts for merge of
7382ec7d to klp-dev-plus-aosp
* commit '
a8d15474ebb7b595f842ffb23a36cce9bc382f10':
ota_from_target_files: Add an option to not sign OTA packages
Ying Wang [Tue, 28 Jan 2014 00:00:50 +0000 (00:00 +0000)]
am
04cff708: resolved conflicts for merge of
7382ec7d to klp-dev-plus-aosp
* commit '
04cff70804810d27e1fcbef556ebfdc39278d746':
ota_from_target_files: Add an option to not sign OTA packages
Elliott Hughes [Tue, 28 Jan 2014 00:00:19 +0000 (00:00 +0000)]
Merge "Remove libthread_db from the default include path."
Ying Wang [Mon, 27 Jan 2014 23:56:45 +0000 (15:56 -0800)]
resolved conflicts for merge of
7382ec7d to klp-dev-plus-aosp
Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52
Colin Cross [Mon, 27 Jan 2014 23:46:39 +0000 (23:46 +0000)]
am
4695598d: am
ae49acbd: am
1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit '
4695598df1fa11064a54421f60fee66032c673ee':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
Elliott Hughes [Mon, 27 Jan 2014 23:43:19 +0000 (15:43 -0800)]
Remove libthread_db from the default include path.
This should never have been on the default include path.
The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.
Bug:
11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
Colin Cross [Mon, 27 Jan 2014 23:43:33 +0000 (23:43 +0000)]
am
ae49acbd: am
1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit '
ae49acbde766e2e683d3dd026e69f2416da766b1':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
Ying Wang [Mon, 27 Jan 2014 23:42:11 +0000 (23:42 +0000)]
am
ae1c7d96: am
50c548c8: am
25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit '
ae1c7d960715ec90afa4accf0754f176d088a30f':
Don't modify LOCAL_MODULE_TAGS.
Colin Cross [Mon, 27 Jan 2014 23:40:22 +0000 (15:40 -0800)]
am
1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit '
1acb1b64b9be43503fa2a9949858b8bb36417e32':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
Ying Wang [Mon, 27 Jan 2014 23:37:18 +0000 (23:37 +0000)]
Merge "ota_from_target_files: Add an option to not sign OTA packages"
Colin Cross [Mon, 27 Jan 2014 23:35:00 +0000 (23:35 +0000)]
Merge changes I62504bad,I16208cca,I4e4ceec6
* changes:
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
Ying Wang [Mon, 27 Jan 2014 23:32:44 +0000 (23:32 +0000)]
am
50c548c8: am
25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit '
50c548c8f4e0df0c3a04e2b1cc91d79e067d940e':
Don't modify LOCAL_MODULE_TAGS.
Ying Wang [Mon, 27 Jan 2014 23:25:35 +0000 (15:25 -0800)]
am
25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit '
25a16fe80ee7795c4763045061779f3c7068813d':
Don't modify LOCAL_MODULE_TAGS.
Ying Wang [Mon, 27 Jan 2014 23:20:05 +0000 (23:20 +0000)]
Merge "Don't modify LOCAL_MODULE_TAGS."
Ying Wang [Mon, 27 Jan 2014 23:19:09 +0000 (15:19 -0800)]
Don't modify LOCAL_MODULE_TAGS.
Change-Id: Id70d48c1d7abf02139925bcb3208515ea1a082b9
Ying Wang [Mon, 27 Jan 2014 23:05:22 +0000 (23:05 +0000)]
am
a4d70f94: am
0105f1cc: am
07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '
a4d70f9435764339695e9264ac5d815a894e1e9f':
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
Ying Wang [Mon, 27 Jan 2014 23:01:02 +0000 (23:01 +0000)]
am
0105f1cc: am
07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '
0105f1cc9aa2ea3c683c197b18747f5b04310c27':
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
Ying Wang [Mon, 27 Jan 2014 22:57:57 +0000 (14:57 -0800)]
am
07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '
07b16c0d5be77e53325a9f93c2f7f68632417792':
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
Ying Wang [Mon, 27 Jan 2014 22:52:13 +0000 (22:52 +0000)]
Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
Colin Cross [Sat, 25 Jan 2014 07:17:21 +0000 (23:17 -0800)]
add new gen/ directory for generated sources
Allow modules to generate source into $OUT/gen, which will then
be copied into $OUT/obj and $OUT/obj_$(TARGET_2ND_ARCH) as
necessary. This allows a single build rule invocation that includes
generated source to build for the first and second architectures.
Modules will need to change calls to local-intermediates-dir into
local-generated-sources-dir.
Change-Id: I62504bad9454b3d9fde7b84ab9f0a487a2ecf0bf
Colin Cross [Sat, 25 Jan 2014 03:30:27 +0000 (19:30 -0800)]
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Using LOCAL_MODULE_PATH in a shared library module while building a
multiarch target will cause build rules for both architectures to install
into the same path. Warn and suggest LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I16208ccada6d43a26a342af35096f49d8df26e81
Colin Cross [Sat, 25 Jan 2014 03:23:40 +0000 (19:23 -0800)]
Support LOCAL_MODULE_RELATIVE_PATH
Most users of LOCAL_MODULE_PATH are setting a subdirectory of the
normal install path, for example to install HALs into system/lib/hw.
This is problematic for multiarch builds, where the install location
depends on the arch. Allow modules to specify LOCAL_MODULE_RELATIVE_PATH.
HALs will generally use:
LOCAL_MODULE_RELATIVE_PATH := hw
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
Andrew Boie [Fri, 13 Dec 2013 22:28:53 +0000 (14:28 -0800)]
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
We have no rigorous way to detect whether the code referenced for this
mechanism changes in between builds. So declare this as a phony target
so that it is rebuilt every time.
Change-Id: Ie1670d96895719d406e7b0defd53ba3cd224dd83
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Ying Wang [Mon, 27 Jan 2014 19:49:25 +0000 (19:49 +0000)]
am
3512ed49: am
f2777de6: am
18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '
3512ed49a0cecd103de62eb9869e60dab144a6fb':
Support arch-specific LOCAL_C_INCLUDES.
Ying Wang [Mon, 27 Jan 2014 19:30:25 +0000 (19:30 +0000)]
am
f2777de6: am
18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '
f2777de63984114f30a3d4d73bacd8e4059ea5ea':
Support arch-specific LOCAL_C_INCLUDES.
Ying Wang [Mon, 27 Jan 2014 19:20:13 +0000 (11:20 -0800)]
am
18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '
18294fbf8c133aaaa5a97a6f36ab92d41aa8e13a':
Support arch-specific LOCAL_C_INCLUDES.
Ying Wang [Mon, 27 Jan 2014 18:28:35 +0000 (18:28 +0000)]
Merge "Support arch-specific LOCAL_C_INCLUDES."
Ying Wang [Mon, 27 Jan 2014 18:27:19 +0000 (10:27 -0800)]
Support arch-specific LOCAL_C_INCLUDES.
Bug:
11654773
Change-Id: I89c7ce7ff8bea15cb81f9cd9b0188b54beed3422
Takeshi Kanemoto [Thu, 14 Nov 2013 08:20:50 +0000 (17:20 +0900)]
ota_from_target_files: Add an option to not sign OTA packages
Sometimes it is useful to be able to tell ota_from_target_files
to not sign the output zip file. For instance, the private
release key may not be available when ota_from_target_files
is executed; similarly the release tools may not be available
or executable where the private key is stored.
This change adds an option, '--no_signing', to simply output the
unsigned OTA zip file, instead of spuriously signing it with the
test key even though the zip file would need to be re-signed later
with a different key.
Change-Id: I1f3c4dc8ffa35ce85478f848b147aff3d40fe283
Colin Cross [Sat, 25 Jan 2014 00:57:00 +0000 (00:57 +0000)]
am
dda94546: am
4a1f42d7: am
7c7f28e7: Merge changes Ib1d950e1,I3d020a3c,Ic9594718
* commit '
dda94546e4682627a9446ee7523a1411c1841d7a':
Add 2nd arch directories for apps
Set up rules to build prebuilts for TARGET_2ND_ARCH
Set up rules to build packages for TARGET_2ND_ARCH
Colin Cross [Sat, 25 Jan 2014 00:54:37 +0000 (00:54 +0000)]
am
4a1f42d7: am
7c7f28e7: Merge changes Ib1d950e1,I3d020a3c,Ic9594718
* commit '
4a1f42d70e1675ce531a1e9df3665b81e5a996c6':
Add 2nd arch directories for apps
Set up rules to build prebuilts for TARGET_2ND_ARCH
Set up rules to build packages for TARGET_2ND_ARCH
Colin Cross [Sat, 25 Jan 2014 00:52:14 +0000 (16:52 -0800)]
am
7c7f28e7: Merge changes Ib1d950e1,I3d020a3c,Ic9594718
* commit '
7c7f28e71044ca04d368dec626faba37fe74818d':
Add 2nd arch directories for apps
Set up rules to build prebuilts for TARGET_2ND_ARCH
Set up rules to build packages for TARGET_2ND_ARCH
Colin Cross [Sat, 25 Jan 2014 00:46:33 +0000 (00:46 +0000)]
Merge changes Ib1d950e1,I3d020a3c,Ic9594718
* changes:
Add 2nd arch directories for apps
Set up rules to build prebuilts for TARGET_2ND_ARCH
Set up rules to build packages for TARGET_2ND_ARCH
Colin Cross [Fri, 24 Jan 2014 21:37:07 +0000 (13:37 -0800)]
Add 2nd arch directories for apps
Apps built for 2nd arch install in the same directories as when
built for the 1st arch.
Change-Id: Ib1d950e186eef88212b44d04e6bc6c30a3d56155
Colin Cross [Fri, 24 Jan 2014 21:34:51 +0000 (13:34 -0800)]
Set up rules to build prebuilts for TARGET_2ND_ARCH
Prebuilts built for the 2nd arch will install into 2nd arch
directories.
Change-Id: I3d020a3c1fb0f2eb0579933f8a66e410e66fdd44
Colin Cross [Fri, 24 Jan 2014 21:33:39 +0000 (13:33 -0800)]
Set up rules to build packages for TARGET_2ND_ARCH
Packages built for the 2nd arch will depend on jni libraries
build for the 2nd arch.
Change-Id: Ic9594718849b2577920c500c35d46150eb948c8d
Ying Wang [Fri, 24 Jan 2014 22:00:50 +0000 (22:00 +0000)]
am
0f561354: am
5cc096b7: am
2c0260ab: Merge "build: print module that has unhandled install path"
* commit '
0f5613546817fd9a8879f7dbefac07fbf1258192':
build: print module that has unhandled install path
Ying Wang [Fri, 24 Jan 2014 21:57:19 +0000 (21:57 +0000)]
am
81ea7ed4: am
f34c4c71: am
125ddab1: Merge "build: use correct arm vs thumb arguments for 2nd arch builds"
* commit '
81ea7ed4625f461cfd9b08a426b4b85e2718039c':
build: use correct arm vs thumb arguments for 2nd arch builds
Ying Wang [Fri, 24 Jan 2014 21:57:09 +0000 (21:57 +0000)]
am
5cc096b7: am
2c0260ab: Merge "build: print module that has unhandled install path"
* commit '
5cc096b73bd563b470f4255edf7136c8fda1d0f0':
build: print module that has unhandled install path
Ying Wang [Fri, 24 Jan 2014 21:53:51 +0000 (21:53 +0000)]
am
d9926a93: am
4e08d304: am
f2044b41: Merge "build: use arm kernel headers for arm 2nd arch builds"
* commit '
d9926a93ae0869a3bea9c0755b89708330bd6edb':
build: use arm kernel headers for arm 2nd arch builds
Ying Wang [Fri, 24 Jan 2014 21:53:50 +0000 (21:53 +0000)]
am
12ebfbcd: am
0c09d5b2: am
e778ec89: Merge "Support arch-specific LOCAL_ variables"
* commit '
12ebfbcd9daebda6ebace823ced79f795dd401d1':
Support arch-specific LOCAL_ variables
Ying Wang [Fri, 24 Jan 2014 21:53:49 +0000 (21:53 +0000)]
am
ebbec848: am
23752157: am
3beb831c: Merge "Make sure to install the .odex when running "make <module_name>""
* commit '
ebbec848be133dcf8dabe9ea9f1a48646bd72740':
Make sure to install the .odex when running "make <module_name>"
Ying Wang [Fri, 24 Jan 2014 21:53:48 +0000 (21:53 +0000)]
am
fbb8b629: am
746d1f73: am
9e21bcdc: Merge "Support to build executables for TARGET_2ND_ARCH"
* commit '
fbb8b629bed067420ceb987513394051d3b395bb':
Support to build executables for TARGET_2ND_ARCH
Ying Wang [Fri, 24 Jan 2014 21:53:47 +0000 (13:53 -0800)]
am
2c0260ab: Merge "build: print module that has unhandled install path"
* commit '
2c0260abc7099c79646928cc5a60eeba282736ad':
build: print module that has unhandled install path
Ying Wang [Fri, 24 Jan 2014 21:53:39 +0000 (21:53 +0000)]
am
f34c4c71: am
125ddab1: Merge "build: use correct arm vs thumb arguments for 2nd arch builds"
* commit '
f34c4c71b8edb7811bbad495836f3b96a8ff89e1':
build: use correct arm vs thumb arguments for 2nd arch builds
Ying Wang [Fri, 24 Jan 2014 21:50:20 +0000 (13:50 -0800)]
am
125ddab1: Merge "build: use correct arm vs thumb arguments for 2nd arch builds"
* commit '
125ddab1fbf084d25c1fa2c43c735f4ff4636f80':
build: use correct arm vs thumb arguments for 2nd arch builds
Ying Wang [Fri, 24 Jan 2014 21:50:15 +0000 (21:50 +0000)]
am
4e08d304: am
f2044b41: Merge "build: use arm kernel headers for arm 2nd arch builds"
* commit '
4e08d3049be8e04e6043241d01b7007c63312bd3':
build: use arm kernel headers for arm 2nd arch builds
Ying Wang [Fri, 24 Jan 2014 21:50:14 +0000 (21:50 +0000)]
am
0c09d5b2: am
e778ec89: Merge "Support arch-specific LOCAL_ variables"
* commit '
0c09d5b2ab36e1c188c40ee809e3d5e9cadc35a5':
Support arch-specific LOCAL_ variables
Ying Wang [Fri, 24 Jan 2014 21:50:13 +0000 (21:50 +0000)]
am
23752157: am
3beb831c: Merge "Make sure to install the .odex when running "make <module_name>""
* commit '
23752157bc4b28b431f04e2b040db55aba404fb8':
Make sure to install the .odex when running "make <module_name>"
Ying Wang [Fri, 24 Jan 2014 21:50:12 +0000 (21:50 +0000)]
am
746d1f73: am
9e21bcdc: Merge "Support to build executables for TARGET_2ND_ARCH"
* commit '
746d1f732f4d933addb08d5039095edb07f56f84':
Support to build executables for TARGET_2ND_ARCH
Ying Wang [Fri, 24 Jan 2014 21:48:09 +0000 (21:48 +0000)]
am
443c9dc8: am
c236e00e: am
7da9740a: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources"
* commit '
443c9dc818e6f0db222b2a34962eafde4ff22991':
Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources
Ying Wang [Fri, 24 Jan 2014 21:48:08 +0000 (21:48 +0000)]
am
778c138b: am
52afa28f: am
a07de328: Merge "Set up rules to build shared libraries for TARGET_2ND_ARCH"
* commit '
778c138b257a3daf2c1ca921abe0843129a96bf5':
Set up rules to build shared libraries for TARGET_2ND_ARCH
Ying Wang [Fri, 24 Jan 2014 21:48:07 +0000 (21:48 +0000)]
am
095bc78e: am
382ad032: am
e7345edc: Merge "Set up rules to build static libraries for TARGET_2ND_ARCH"
* commit '
095bc78ed503d031901dbe0770e48920169ece18':
Set up rules to build static libraries for TARGET_2ND_ARCH
Ying Wang [Fri, 24 Jan 2014 21:48:06 +0000 (21:48 +0000)]
am
add64250: am
d6c4fcab: am
732bdb28: Merge "Load compiler environment for a second arch."
* commit '
add64250b230a859610d5a157a03adf85cb128c5':
Load compiler environment for a second arch.
Ying Wang [Fri, 24 Jan 2014 21:46:57 +0000 (13:46 -0800)]
am
f2044b41: Merge "build: use arm kernel headers for arm 2nd arch builds"
* commit '
f2044b41cf11e584ab5df87b6a11f04ae26c6865':
build: use arm kernel headers for arm 2nd arch builds
Ying Wang [Fri, 24 Jan 2014 21:46:56 +0000 (13:46 -0800)]
am
e778ec89: Merge "Support arch-specific LOCAL_ variables"
* commit '
e778ec89fd249e15608b7629963619d99e8a34bf':
Support arch-specific LOCAL_ variables
Ying Wang [Fri, 24 Jan 2014 21:46:55 +0000 (13:46 -0800)]
am
3beb831c: Merge "Make sure to install the .odex when running "make <module_name>""
* commit '
3beb831c79b6051e881d17979981a846259bcd99':
Make sure to install the .odex when running "make <module_name>"
Ying Wang [Fri, 24 Jan 2014 21:46:55 +0000 (13:46 -0800)]
am
9e21bcdc: Merge "Support to build executables for TARGET_2ND_ARCH"
* commit '
9e21bcdc880e1769a4abe31836884f69752fc35e':
Support to build executables for TARGET_2ND_ARCH