OSDN Git Service
Torne (Richard Coles) [Fri, 21 Feb 2014 18:35:17 +0000 (10:35 -0800)]
am
f93beb21: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '
f93beb2167728c8a3ce549074db01d37e9786458':
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
Ying Wang [Fri, 21 Feb 2014 18:35:15 +0000 (10:35 -0800)]
am
d3579f4e: Merge "Add a dummy build recipe for the proto generated header files"
* commit '
d3579f4ee0135f0a9636adb963704cc8d5c041e1':
Add a dummy build recipe for the proto generated header files
Colin Cross [Fri, 21 Feb 2014 18:35:13 +0000 (10:35 -0800)]
Colin Cross [Fri, 21 Feb 2014 18:35:12 +0000 (10:35 -0800)]
am
b01233f2: am
a0eb50ac: resolved conflicts for merge of
2fbe5018 to klp-modular-dev-plus-aosp
* commit '
b01233f26f8d4a028ac1def2330005c3dade070a':
add linker64 and debuggerd64 to all products
Colin Cross [Fri, 21 Feb 2014 18:35:12 +0000 (10:35 -0800)]
am
59320c13: am
9b2077d4: am
3bbaab31: Merge changes I2514f66f,I71fed98d
* commit '
59320c13748be94db4267a26f43fe26dcf6938a2':
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
Ying Wang [Fri, 21 Feb 2014 18:35:11 +0000 (10:35 -0800)]
am
1fd8265d: am
1e8fec5b: am
e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
* commit '
1fd8265d1a1a48d8c1805553669bbefb32956deb':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
Colin Cross [Fri, 21 Feb 2014 18:35:10 +0000 (10:35 -0800)]
am
25d84aa3: am
4048cf3a: am
7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"
* commit '
25d84aa38f79f40df54a0a4e75b3e89253a4b332':
don't use LOCAL_*_arch for host builds
Colin Cross [Fri, 21 Feb 2014 18:35:10 +0000 (10:35 -0800)]
am
59dc65a2: am
481fed17: am
f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit '
59dc65a28a6e33e518006ec6c7edaa1971a1c2a7':
make 64-bit builds into multiarch builds
Ying Wang [Fri, 21 Feb 2014 18:35:09 +0000 (10:35 -0800)]
am
ca389b90: am
5768ac91: am
5c7039fb: Merge "Remove dead code."
* commit '
ca389b9048c0273d34e495809986441803f35d28':
Remove dead code.
Colin Cross [Fri, 21 Feb 2014 18:35:04 +0000 (10:35 -0800)]
am
84a20ac1: am
2c32144b: resolved conflicts for merge of
7cd7bd65 to klp-modular-dev-plus-aosp
* commit '
84a20ac12e07109f5682d77a131f25995f7c2d0e':
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
Ying Wang [Fri, 21 Feb 2014 18:35:04 +0000 (10:35 -0800)]
am
0a60bdf5: am
0b7197a6: am
cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
* commit '
0a60bdf59a5c4eb3a07bee913855c85f8cde8731':
Refactor a little bit and do the validation on also default.prop.
Ying Wang [Fri, 21 Feb 2014 18:35:03 +0000 (10:35 -0800)]
am
53d2ca07: am
4170e2be: am
fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
* commit '
53d2ca071334ed327ab084c28321a96cde0dad33':
Support custom sdk.atree files.
Ying Wang [Fri, 21 Feb 2014 18:35:02 +0000 (10:35 -0800)]
am
3afdef2e: am
ca23f57c: am
de90b030: Merge "A build property\'s value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message."
* commit '
3afdef2ef04bcef5a7af679e554b7f5988f44a61':
A build property's value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message.
Ying Wang [Fri, 21 Feb 2014 18:35:01 +0000 (10:35 -0800)]
am
e6a65a5f: resolved conflicts for merge of
b6d53f0b to master
* commit '
e6a65a5f15695f4e601110979dc6861773c3444d':
Clean up dangling module names
Ying Wang [Fri, 21 Feb 2014 18:35:00 +0000 (10:35 -0800)]
am
6336d6bf: am
1968f286: am
b12cce10: Merge "Refine module name resolving in multilib build"
* commit '
6336d6bf07f0c43f1675cbd99a887e572b4625e8':
Refine module name resolving in multilib build
Elliott Hughes [Fri, 21 Feb 2014 18:34:59 +0000 (10:34 -0800)]
am
a0945a24: am
1e317e77: am
993ffb80: Merge "Add all-S-files-under."
* commit '
a0945a24f9234cd3929d89e0f02a1e8d066d4124':
Add all-S-files-under.
Scott Main [Fri, 21 Feb 2014 18:34:58 +0000 (10:34 -0800)]
am
3634c0df: am
0ed897d0: am
83aeb2f9: am
e2652df8: am
22866695: am
2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '
3634c0dfc150ce8270bf9e733f579548734e6be8':
set a smaller line height for sidebox headers to avoid whitespace at the top
Colin Cross [Fri, 21 Feb 2014 18:34:58 +0000 (10:34 -0800)]
am
ce04c505: am
d121d417: am
90ed06ef: Merge "fix 2nd target clang prebuilt paths"
* commit '
ce04c505a0aafc0d430efb9e119526c9ac35630d':
fix 2nd target clang prebuilt paths
Ying Wang [Fri, 21 Feb 2014 18:34:57 +0000 (10:34 -0800)]
am
1eba3c14: am
484c7dec: am
ba46260f: Merge "Runtime resource overlay, iteration 2"
* commit '
1eba3c14c760d89150f68141f708621dd46d69bd':
Runtime resource overlay, iteration 2
Justin Koh [Fri, 21 Feb 2014 18:34:56 +0000 (10:34 -0800)]
am
f26c96ed: resolved conflicts for merge of
34cb6460 to master
* commit '
f26c96edc5ce0d67f9dc35c95eea91ab92ea9c64':
Change core_tiny to not be minimal font footprint.
Steve Moyer [Fri, 21 Feb 2014 18:34:55 +0000 (10:34 -0800)]
am
60250d42: Merge "Adding SmsTest to sdk build"
* commit '
60250d42a11a6e97366843d4940cde2c010027fa':
Adding SmsTest to sdk build
Dianne Hackborn [Fri, 21 Feb 2014 18:34:55 +0000 (10:34 -0800)]
am
fc021daa: Fix issue #
12939338: Android version showing as \'KKWT\'
* commit '
fc021daaca11917888ed941ee0ea1877965d437b':
Fix issue #
12939338: Android version showing as 'KKWT'
David 'Digit' Turner [Fri, 21 Feb 2014 18:34:54 +0000 (10:34 -0800)]
am
35cfe9e8: am
cc57457c: am
145562fc: Merge "Add missing font files to SDK system images."
* commit '
35cfe9e8af0699236a422f3139860c53d97f65b7':
Add missing font files to SDK system images.
Ying Wang [Fri, 21 Feb 2014 18:34:53 +0000 (10:34 -0800)]
am
a87489b5: am
74b71317: am
2d72094f: am
960d919e: resolved conflicts for merge of
4df82b3e to klp-dev-plus-aosp
* commit '
a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0':
Allow proguarding the main app and the test app in a single run.
Ben Cheng [Fri, 21 Feb 2014 18:34:52 +0000 (10:34 -0800)]
am
2ad7d4df: am
7495e68a: am
6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"
* commit '
2ad7d4df0746e7e16fd3cc39d14fa352801abcae':
Refreshed gcc predefines __ANDROID__
Ying Wang [Fri, 21 Feb 2014 18:34:51 +0000 (10:34 -0800)]
am
956cd054: am
34afc565: am
5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."
* commit '
956cd054683308b3de25401e64dfc8abda795de9':
Select the arch_variant_cflags for the 2nd arch.
Ying Wang [Fri, 21 Feb 2014 18:34:50 +0000 (10:34 -0800)]
am
30d8e12c: resolved conflicts for merge of
d616a73d to master
* commit '
30d8e12c87bc6232a786a6f66d2e2aee2e95fa1a':
Refactor llvm_config.mk and support the 2nd arch
Colin Cross [Fri, 21 Feb 2014 18:34:50 +0000 (10:34 -0800)]
am
e3ae5a46: am
ddd7c919: am
5e9a2033: Merge "don\'t rename 32-bit packages to *_32"
* commit '
e3ae5a467799f063ebdcfe85786b0f625a30d4ad':
don't rename 32-bit packages to *_32
Elliott Hughes [Fri, 21 Feb 2014 18:34:49 +0000 (10:34 -0800)]
am
3e3cde55: am
4d5fa510: am
8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
* commit '
3e3cde556f30547e66638f89a4c3ce04b60b73cc':
Turn 64-bit-related warnings into errors on 64-bit builds.
Elliott Hughes [Fri, 21 Feb 2014 18:34:48 +0000 (10:34 -0800)]
am
77f88ce0: am
3f040869: am
efb9603a: Merge "[MIPS64] Add mips64 target"
* commit '
77f88ce0da4aedad4b095852432ae60fa8160eda':
[MIPS64] Add mips64 target
Ying Wang [Fri, 21 Feb 2014 18:34:44 +0000 (10:34 -0800)]
am
dd22aee1: am
69c3f457: am
dc7fee9f: Set up rules to merge AndroidManifest.xmls
* commit '
dd22aee1f4e7acf935cc640fb5ec4fca8db721c1':
Set up rules to merge AndroidManifest.xmls
Andreas Huber [Fri, 21 Feb 2014 18:34:43 +0000 (10:34 -0800)]
am
a42d3a48: fix the build, libstagefright_chromium_http is no longer needed.
* commit '
a42d3a4865785f75da449f6dc28f7d9054ea2418':
fix the build, libstagefright_chromium_http is no longer needed.
Christopher Ferris [Fri, 21 Feb 2014 18:34:42 +0000 (10:34 -0800)]
am
5d8ee715: am
6d0899ea: am
afbbce3f: Merge "Add library test makefile solutions."
* commit '
5d8ee7150668cf3c0c034ff42d1a8f43cca7aa8b':
Add library test makefile solutions.
Colin Cross [Fri, 21 Feb 2014 18:34:41 +0000 (10:34 -0800)]
am
98255dc9: am
d69ed2e2: am
054b0274: Merge topic \'arm64\'
* commit '
98255dc988ad51bb900ff5cd2571071e120d0080':
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
Colin Cross [Fri, 21 Feb 2014 18:34:41 +0000 (10:34 -0800)]
am
96870b3e: am
dc5249ab: am
717de0f5: Merge "Fix installing 2nd arch shared libraries"
* commit '
96870b3eb448fe4817b6ad9a12b409b318d58d2e':
Fix installing 2nd arch shared libraries
Ying Wang [Fri, 21 Feb 2014 18:34:40 +0000 (10:34 -0800)]
Ying Wang [Fri, 21 Feb 2014 18:34:39 +0000 (10:34 -0800)]
am
d89ffa86: Fix emulator builds
* commit '
d89ffa8623b750f85cbb8be01aba9fa4a9448180':
Fix emulator builds
Adam Lesinski [Fri, 21 Feb 2014 18:34:38 +0000 (10:34 -0800)]
am
9cee77b3: am
bebb2b54: am
7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
* commit '
9cee77b3704eaeee30b724590fe62ad5a8305339':
Allow multiple asset directories in aapt
Justin Koh [Fri, 21 Feb 2014 18:34:38 +0000 (10:34 -0800)]
am
19753f45: am
bbfebfad: resolved conflicts for merge of
303d2755 to klp-modular-dev-plus-aosp
* commit '
19753f458bc5ec546f4c5bb304072a53b4f9357f':
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
Doug Zongker [Fri, 21 Feb 2014 18:34:37 +0000 (10:34 -0800)]
am
01ce19c9: make full OTAs block based
* commit '
01ce19c95f358ac8ef9bb939d2637ac976320401':
make full OTAs block based
Doug Zongker [Fri, 21 Feb 2014 18:34:36 +0000 (10:34 -0800)]
am
c9253822: add recovery update code to system images
* commit '
c9253822ea31c1d35d3fc2b495b45b476c240a1d':
add recovery update code to system images
Tim Murray [Fri, 21 Feb 2014 18:34:36 +0000 (10:34 -0800)]
am
e858190f: am
47f9b9bc: am
5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."
* commit '
e858190fc4bb0f7390efa232c963e8669adac4c8':
Add new rs directory to list of Java subdirs of fw/base.
Ying Wang [Fri, 21 Feb 2014 18:34:35 +0000 (10:34 -0800)]
am
8647c336: am
1446cf93: am
a77456b8: Merge "Dedup the targets and dependencies of required modules."
* commit '
8647c3366f6c6679aab1a3a1073392a9f6794335':
Dedup the targets and dependencies of required modules.
Ying Wang [Fri, 21 Feb 2014 18:34:34 +0000 (10:34 -0800)]
am
fc330375: Dedup the targets and dependencies of required modules.
* commit '
fc33037547495aa21b25216d360b27a7100e2a42':
Dedup the targets and dependencies of required modules.
Noreen Tolland [Fri, 21 Feb 2014 18:34:33 +0000 (10:34 -0800)]
am
d76bb175: am
4b69be27: (-s ours) am
c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
* commit '
d76bb1755d843f90525a22c191938037cf87a7a1':
(DO NOT MERGE) Revert "Make libart the default runtime"
Ben Cheng [Fri, 21 Feb 2014 18:34:33 +0000 (10:34 -0800)]
am
bc80daff: am
09c9881f: am
5608a8c6: Merge "Add 64-bit gdbclients."
* commit '
bc80daffee89269c491680ceb0ba29f84dd0fab0':
Add 64-bit gdbclients.
Brian Carlstrom [Fri, 21 Feb 2014 18:34:32 +0000 (10:34 -0800)]
am
7468e276: am
03c16a30: am
aae47044: Merge "CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
7468e2767695c2736f4e1095e1f3579651ba4974':
CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Fri, 21 Feb 2014 18:34:31 +0000 (10:34 -0800)]
am
5b40a0bd: am
a15fc8fd: am
601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
5b40a0bd02d270b03fd8ac6d76ad8e2d53db84ea':
Brian Carlstrom [Fri, 21 Feb 2014 18:29:55 +0000 (10:29 -0800)]
resolved conflicts for merge of
966611a9 to master-nova
Change-Id: Iefe66d7b0bc604460ab18228233ec61c98490b8a
Ian Rogers [Fri, 21 Feb 2014 18:08:29 +0000 (10:08 -0800)]
am
69968b8c: am
1fee45f1: am
e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
* commit '
69968b8c5762a8c7f6127f4aa667b8e8498c5102':
Narayan Kamath [Fri, 21 Feb 2014 18:08:28 +0000 (10:08 -0800)]
am
7201cdef: am
b1aec05a: am
ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
* commit '
7201cdef712a8ff12313de746eb8b0dd4fd8ff51':
Colin Cross [Fri, 21 Feb 2014 18:08:27 +0000 (10:08 -0800)]
am
8c28b594: am
6a7699d5: am
a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
* commit '
8c28b594d9367e43243cd1d014d57204d934539d':
Colin Cross [Fri, 21 Feb 2014 18:08:26 +0000 (10:08 -0800)]
am
92ef2b3d: am
df313a04: am
2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
* commit '
92ef2b3d5b59e7db46bef3ce48b37fa7afafab2b':
Ian Rogers [Fri, 21 Feb 2014 18:08:25 +0000 (10:08 -0800)]
am
0e0b880c: am
eb02fa0a: am
805cb8fa: Merge "Fix the host inttypes.h problem globally."
* commit '
0e0b880c4bf89ff45143e549227e701b6b39958d':
Brian Carlstrom [Fri, 21 Feb 2014 18:08:24 +0000 (10:08 -0800)]
am
8bc31b6d: am
d4e29f52: am
cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
* commit '
8bc31b6d1479b75ecd1b9fc6080529397e067158':
Nick Vaccaro [Fri, 21 Feb 2014 18:08:23 +0000 (10:08 -0800)]
am
2422e761: am
ec0c99a6: Add atrace for supporting systrace tool
* commit '
2422e76192821fb1f14d079de612ea2c5fe9aeae':
Baligh Uddin [Thu, 12 Dec 2013 21:50:41 +0000 (13:50 -0800)]
Add the Telecomm entry in core.mk
Santos Cordon [Wed, 18 Dec 2013 04:26:30 +0000 (20:26 -0800)]
Adding telecomm to build src path for framework.
Change-Id: I36a7df9ed30c949241cc19dd67994883db68394f
Torne (Richard Coles) [Fri, 14 Feb 2014 10:49:30 +0000 (10:49 +0000)]
Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
Ying Wang [Fri, 14 Feb 2014 02:29:52 +0000 (02:29 +0000)]
Merge "Add a dummy build recipe for the proto generated header files"
Ying Wang [Fri, 14 Feb 2014 02:04:00 +0000 (18:04 -0800)]
Add a dummy build recipe for the proto generated header files
This fixed issue that gnumake skip updating the cpp file that includes
the generated header file when the .proto file gets updated.
For example:
Say a.cc includes b.pb.h, since b.pb.h is just byproduct of the rule
that generates b.pb.cc, and though we have dependency "b.pb.h :
b.pb.cc", but we don't have build recipe for that rule.
Gmake stupidly thinks that b.pb.h must not be updated in that case so
it skips all targets that depends on b.pb.h!
With the dumy build recipe, gmake now doesn't skip the depedent targets.
Bug:
13009798
Change-Id: I39adc09b7656bdd023f578fb8933667944fd974c
Colin Cross [Fri, 14 Feb 2014 00:58:46 +0000 (00:58 +0000)]
Colin Cross [Fri, 14 Feb 2014 00:51:53 +0000 (00:51 +0000)]
am
a0eb50ac: resolved conflicts for merge of
2fbe5018 to klp-modular-dev-plus-aosp
* commit '
a0eb50accabe83b18bd3fe3b9d6417a4718af9e2':
add linker64 and debuggerd64 to all products
Colin Cross [Fri, 14 Feb 2014 00:50:00 +0000 (00:50 +0000)]
Colin Cross [Fri, 14 Feb 2014 00:44:29 +0000 (00:44 +0000)]
Merge "fix build"
Colin Cross [Fri, 14 Feb 2014 00:41:50 +0000 (16:41 -0800)]
fix build
Include prebuilt_internal.mk for host builds.
Change-Id: I750d6f71b3a2c67b11536babb8b39060005f4ff4
Colin Cross [Fri, 14 Feb 2014 00:35:33 +0000 (00:35 +0000)]
am
9b2077d4: am
3bbaab31: Merge changes I2514f66f,I71fed98d
* commit '
9b2077d4b969e9f8598242915f094552c5d78ad5':
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
Colin Cross [Fri, 14 Feb 2014 00:32:48 +0000 (16:32 -0800)]
resolved conflicts for merge of
2fbe5018 to klp-modular-dev-plus-aosp
Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd
Colin Cross [Fri, 14 Feb 2014 00:28:53 +0000 (00:28 +0000)]
am
3bbaab31: Merge changes I2514f66f,I71fed98d
* commit '
3bbaab31069045aea9ae33c1d995640e56182a82':
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
Colin Cross [Fri, 14 Feb 2014 00:24:47 +0000 (00:24 +0000)]
Merge "add linker64 and debuggerd64 to all products"
Colin Cross [Fri, 14 Feb 2014 00:24:16 +0000 (00:24 +0000)]
Merge changes I2514f66f,I71fed98d
* changes:
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
Colin Cross [Thu, 13 Feb 2014 06:04:28 +0000 (22:04 -0800)]
add linker64 and debuggerd64 to all products
Add linker64 and debuggerd64 to embedded.mk. They will be silently
ignored on 32-bit builds, and filtered out on 32-bit sdk builds.
Change-Id: I8c30ea65e2b7e224ee73cc9fbbcb7555d3be04b5
Ying Wang [Fri, 14 Feb 2014 00:15:42 +0000 (00:15 +0000)]
am
1e8fec5b: am
e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
* commit '
1e8fec5baea381604a2bf197bfb091eeb7aa36ef':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
Colin Cross [Fri, 14 Feb 2014 00:15:42 +0000 (00:15 +0000)]
am
4048cf3a: am
7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"
* commit '
4048cf3a70dd6405f7ff08b8a3d714d1a7b7d446':
don't use LOCAL_*_arch for host builds
Ying Wang [Fri, 14 Feb 2014 00:09:58 +0000 (00:09 +0000)]
am
e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
* commit '
e2f06adb8873ede16f829690b4dbab07b8121aa8':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
Colin Cross [Fri, 14 Feb 2014 00:09:57 +0000 (00:09 +0000)]
am
7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"
* commit '
7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f':
don't use LOCAL_*_arch for host builds
Ying Wang [Fri, 14 Feb 2014 00:03:12 +0000 (00:03 +0000)]
Merge "Don't check the existence for the 64-bit modules for 32-bit SDK build."
Ying Wang [Thu, 13 Feb 2014 23:56:34 +0000 (15:56 -0800)]
Don't check the existence for the 64-bit modules for 32-bit SDK build.
Change-Id: I0d5d6ecc07332bef6854466fd98380eb12fc08fc
Colin Cross [Thu, 13 Feb 2014 23:04:18 +0000 (15:04 -0800)]
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Prebuilts often support only a single architecture, allow them to
use LOCAL_MODULE_TARGET_ARCH to specify it.
Change-Id: I2514f66f682ef267bbf1a1ab78510faff0a18b64
Colin Cross [Thu, 13 Feb 2014 21:41:52 +0000 (13:41 -0800)]
Add generated sources dir to the default include path
Change-Id: I71fed98dfbc0bf5efad069a251eee2e5ab2e5fe6
Colin Cross [Thu, 13 Feb 2014 23:00:40 +0000 (23:00 +0000)]
Merge "don't use LOCAL_*_arch for host builds"
Colin Cross [Thu, 13 Feb 2014 05:15:12 +0000 (21:15 -0800)]
don't use LOCAL_*_arch for host builds
The LOCAL_*_$(TARGET_ARCH) variables don't make sense for host
modules, only append use them for target modules.
Also complete the list of LOCAL_*_arch and LOCAL_*_32/64 to be
consistent.
Change-Id: I00c83e5c4e08ed9a844f9f99a79ce4bcc3f0bf11
Colin Cross [Thu, 13 Feb 2014 21:38:00 +0000 (21:38 +0000)]
am
481fed17: am
f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit '
481fed17fad5141154d8cf9532c0803ade24a6a6':
make 64-bit builds into multiarch builds
Colin Cross [Thu, 13 Feb 2014 21:20:31 +0000 (21:20 +0000)]
am
f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit '
f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
Colin Cross [Thu, 13 Feb 2014 21:15:00 +0000 (21:15 +0000)]
Merge "make 64-bit builds into multiarch builds"
Ying Wang [Thu, 13 Feb 2014 11:27:22 +0000 (11:27 +0000)]
am
5768ac91: am
5c7039fb: Merge "Remove dead code."
* commit '
5768ac917ca0e08a6a356159e0a8837f1bcfc7ff':
Remove dead code.
Colin Cross [Tue, 28 Jan 2014 22:35:16 +0000 (14:35 -0800)]
make 64-bit builds into multiarch builds
Also enable the 64-bit binder interface and make them only use ART.
Change-Id: I05de41ce348c14722c84a658f745659bde5ba423
Ying Wang [Thu, 13 Feb 2014 01:45:38 +0000 (01:45 +0000)]
am
5c7039fb: Merge "Remove dead code."
* commit '
5c7039fb069c040759df0a5a15241dd7f8b2f9b7':
Remove dead code.
Ying Wang [Thu, 13 Feb 2014 01:39:41 +0000 (01:39 +0000)]
Merge "Remove dead code."
Ying Wang [Thu, 13 Feb 2014 01:38:46 +0000 (17:38 -0800)]
Remove dead code.
Change-Id: Ia36a04037e15cbf296f375f3ece9a7e977fdca1e
Colin Cross [Wed, 12 Feb 2014 23:00:21 +0000 (23:00 +0000)]
am
2c32144b: resolved conflicts for merge of
7cd7bd65 to klp-modular-dev-plus-aosp
* commit '
2c32144b328e0191fa32bf342dc7eb01d6174b6e':
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
Ying Wang [Wed, 12 Feb 2014 23:00:19 +0000 (23:00 +0000)]
am
0b7197a6: am
cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
* commit '
0b7197a612459caf2cdac8b9f0c0b8c5365b7837':
Refactor a little bit and do the validation on also default.prop.
Ying Wang [Wed, 12 Feb 2014 23:00:18 +0000 (23:00 +0000)]
am
4170e2be: am
fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
* commit '
4170e2be8e7493f2ad1abd33ba74638d9d421b3b':
Support custom sdk.atree files.
Ying Wang [Wed, 12 Feb 2014 23:00:17 +0000 (23:00 +0000)]
am
ca23f57c: am
de90b030: Merge "A build property\'s value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message."
* commit '
ca23f57c419e99ae49714c71ad9eb2a689435580':
A build property's value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message.
Ying Wang [Wed, 12 Feb 2014 22:58:06 +0000 (14:58 -0800)]
resolved conflicts for merge of
b6d53f0b to master
Change-Id: Id01809e2a72ca8ba13594621690273fc6f982095
Ying Wang [Wed, 12 Feb 2014 22:47:33 +0000 (22:47 +0000)]
am
1968f286: am
b12cce10: Merge "Refine module name resolving in multilib build"
* commit '
1968f286d69c36692bd5788fa8745ed16ccc03cb':
Refine module name resolving in multilib build
Elliott Hughes [Wed, 12 Feb 2014 22:47:32 +0000 (22:47 +0000)]
am
1e317e77: am
993ffb80: Merge "Add all-S-files-under."
* commit '
1e317e77fa86ee0450e8a7b1b2ab5bd51720189f':
Add all-S-files-under.
Colin Cross [Wed, 12 Feb 2014 21:06:30 +0000 (13:06 -0800)]
resolved conflicts for merge of
7cd7bd65 to klp-modular-dev-plus-aosp
Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
Ying Wang [Wed, 12 Feb 2014 21:01:03 +0000 (21:01 +0000)]
am
cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
* commit '
cd958154a5bdb753274a338e799c3ece96ea9c5c':
Refactor a little bit and do the validation on also default.prop.
Ying Wang [Wed, 12 Feb 2014 20:58:02 +0000 (20:58 +0000)]
am
fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
* commit '
fd841351efaeb241f0b499231671772caa21f19e':
Support custom sdk.atree files.