OSDN Git Service
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.
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.
Ying Wang [Wed, 12 Feb 2014 20:56:31 +0000 (20:56 +0000)]
Merge "Refactor a little bit and do the validation on also default.prop."
Ying Wang [Wed, 12 Feb 2014 20:54:30 +0000 (20:54 +0000)]
Merge "Support custom sdk.atree files." into klp-modular-dev
Ying Wang [Wed, 12 Feb 2014 19:22:53 +0000 (19:22 +0000)]
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 '
de90b0307a603449354bb2d265c5b2315b7b6850':
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 19:22:52 +0000 (19:22 +0000)]
am
bec954d0: Merge "Clean up dangling module names"
* commit '
bec954d05e0eeec178c796d2332ee9a86becb5dc':
Clean up dangling module names
Ying Wang [Wed, 12 Feb 2014 19:22:51 +0000 (19:22 +0000)]
am
b12cce10: Merge "Refine module name resolving in multilib build"
* commit '
b12cce10fab8c9adda213506be4ce675104655da':
Refine module name resolving in multilib build
Elliott Hughes [Wed, 12 Feb 2014 19:22:29 +0000 (19:22 +0000)]
am
993ffb80: Merge "Add all-S-files-under."
* commit '
993ffb802ee90e07e73e67e523fd040395dfd74d':
Add all-S-files-under.
Ying Wang [Wed, 12 Feb 2014 04:44:09 +0000 (20:44 -0800)]
Refactor a little bit and do the validation on also default.prop.
Change-Id: I76c2344d9033eadede7048689a879c9a69a05b7f
Scott Main [Wed, 12 Feb 2014 16:16:05 +0000 (16:16 +0000)]
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 '
0ed897d01536129165f5df63120a791d933a2865':
set a smaller line height for sidebox headers to avoid whitespace at the top
Scott Main [Wed, 12 Feb 2014 16:10:51 +0000 (16:10 +0000)]
am
83aeb2f9: am
e2652df8: am
22866695: am
2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '
83aeb2f942aa5d9e062e8e06916a6d1d24409d6c':
set a smaller line height for sidebox headers to avoid whitespace at the top
Scott Main [Wed, 12 Feb 2014 16:08:32 +0000 (16:08 +0000)]
am
e2652df8: am
22866695: am
2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '
e2652df8d7411854b3b00adf7c6a6a0af99a545d':
set a smaller line height for sidebox headers to avoid whitespace at the top
Scott Main [Wed, 12 Feb 2014 16:06:03 +0000 (16:06 +0000)]
am
22866695: am
2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '
228666956ade81aa8f993eed70f361ec93073bad':
set a smaller line height for sidebox headers to avoid whitespace at the top
Scott Main [Wed, 12 Feb 2014 16:02:57 +0000 (16:02 +0000)]
am
2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
* commit '
2c2c053490aa3a2102c0dce95fcae0d22b77a71b':
set a smaller line height for sidebox headers to avoid whitespace at the top
Ying Wang [Wed, 12 Feb 2014 03:56:42 +0000 (03:56 +0000)]
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."
Scott Main [Wed, 12 Feb 2014 02:16:20 +0000 (18:16 -0800)]
set a smaller line height for sidebox headers to avoid whitespace at the top
Change-Id: I8f1c4de275f3d7b2f55460bf4dc32a9a3d6b04ae
Ying Wang [Wed, 12 Feb 2014 01:31:21 +0000 (01:31 +0000)]
Merge "Clean up dangling module names"
Ying Wang [Wed, 12 Feb 2014 01:28:30 +0000 (17:28 -0800)]
Clean up dangling module names
Those modules have disappeared from the source tree.
https://code.google.com/p/android/issues/detail?id=61210
Change-Id: Iab369d2f591f46eb86b9fccf2087515edf974662
Ying Wang [Wed, 12 Feb 2014 01:26:10 +0000 (01:26 +0000)]
Merge "Refine module name resolving in multilib build"
Yu Liu [Tue, 11 Feb 2014 03:20:36 +0000 (19:20 -0800)]
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.
For developer's build, show warning message instead of failing the build
(in the latter case, as developers do not usually care about build properties
too much).
Change-Id: I03ced7b486d43a71b1921e0a9c48b43aa30727c7
Elliott Hughes [Tue, 11 Feb 2014 22:01:32 +0000 (22:01 +0000)]
Merge "Add all-S-files-under."
Elliott Hughes [Tue, 11 Feb 2014 21:48:35 +0000 (13:48 -0800)]
Add all-S-files-under.
Change-Id: I25416e2acc850c61226bc7a8e0536384f6eb2dce
Colin Cross [Tue, 11 Feb 2014 21:08:31 +0000 (21:08 +0000)]
am
d121d417: am
90ed06ef: Merge "fix 2nd target clang prebuilt paths"
* commit '
d121d417309ab5a4640437a894a501d4883c3961':
fix 2nd target clang prebuilt paths
Colin Cross [Tue, 11 Feb 2014 21:03:55 +0000 (21:03 +0000)]
am
90ed06ef: Merge "fix 2nd target clang prebuilt paths"
* commit '
90ed06ef84aee84dfc1edba1503a2b2036fc867d':
fix 2nd target clang prebuilt paths
Colin Cross [Tue, 11 Feb 2014 20:58:08 +0000 (20:58 +0000)]
Merge "fix 2nd target clang prebuilt paths"
Colin Cross [Tue, 11 Feb 2014 20:47:52 +0000 (12:47 -0800)]
fix 2nd target clang prebuilt paths
Change-Id: I4c196221bd377e30bbff1aafa265952e29c85cb5
Ying Wang [Tue, 11 Feb 2014 19:41:03 +0000 (19:41 +0000)]
am
484c7dec: am
ba46260f: Merge "Runtime resource overlay, iteration 2"
* commit '
484c7dec798c8ba068f282d1d4398bfdd9b634d3':
Runtime resource overlay, iteration 2
Ying Wang [Tue, 11 Feb 2014 19:34:55 +0000 (19:34 +0000)]
am
ba46260f: Merge "Runtime resource overlay, iteration 2"
* commit '
ba46260f8dee97138d2eb456560b45eb9f914930':
Runtime resource overlay, iteration 2
Ying Wang [Tue, 11 Feb 2014 19:27:59 +0000 (19:27 +0000)]
Merge "Runtime resource overlay, iteration 2"
Justin Koh [Tue, 11 Feb 2014 19:25:37 +0000 (11:25 -0800)]
resolved conflicts for merge of
34cb6460 to master
Change-Id: I46982ef15b479e55b5cdf2f446577fbaa1356cea
Justin Koh [Tue, 11 Feb 2014 18:59:47 +0000 (18:59 +0000)]
am
f0c58da0: Change core_tiny to not be minimal font footprint.
* commit '
f0c58da07d6ebcff215338c1cd1f4410786c1858':
Change core_tiny to not be minimal font footprint.
Justin Koh [Tue, 11 Feb 2014 03:28:15 +0000 (19:28 -0800)]
Change core_tiny to not be minimal font footprint.
Change core_tiny to not be minimal font footprint: UX really wants roboto
condensed. Checked /proc/meminfo before and after the change and didn't
see much difference.
Change-Id: I94072f674ff678dfdbddd66d3792e63245e5e7da
Ying Wang [Tue, 11 Feb 2014 06:26:23 +0000 (22:26 -0800)]
Refine module name resolving in multilib build
-- Added TARGET_PREFER_32_BIT, which sets LOCAL_32_BIT_ONLY for an
executable, if LOCAL_NO_2ND_ARCH is not true.
Name resolving in 64-bit multilib build:
-- Name resolving in PRODUCT_PACKAGES:
foo:32 resolves to foo_32;
foo:64 resolves to foo;
foo resolves to both foo and foo_32 (if foo_32 is defined).
-- Name resolving for LOCAL_REQUIRED_MODULES:
If a module is built for 2nd arch, its required module resolves to
32-bit variant, if it exits;
Otherwise for executable and shared library, a required module
resolves to the default 64-bit variant; for other module classes,
required module foo resolves to both foo and foo_32 (if foo_32 is
defined)
Bug:
12898862
Change-Id: I5fda1a77f58814097b10b5ad2743ee25adfaecc4
Steve Moyer [Tue, 11 Feb 2014 00:42:16 +0000 (00:42 +0000)]
Merge "Adding SmsTest to sdk build"
Dianne Hackborn [Mon, 10 Feb 2014 21:43:00 +0000 (13:43 -0800)]
Fix issue #
12939338: Android version showing as 'KKWT'
Thou shalt be... L!
Change-Id: I53e66eaf64183fbab0b1035cdb376b25abab4879
David 'Digit' Turner [Mon, 10 Feb 2014 13:29:51 +0000 (13:29 +0000)]
am
cc57457c: am
145562fc: Merge "Add missing font files to SDK system images."
* commit '
cc57457c880fdf5e85dd07b11fa61928ca692b45':
Add missing font files to SDK system images.
Ying Wang [Mon, 10 Feb 2014 12:51:36 +0000 (12:51 +0000)]
am
74b71317: am
2d72094f: am
960d919e: resolved conflicts for merge of
4df82b3e to klp-dev-plus-aosp
* commit '
74b71317711fe4bacc6422e45de599fea840f061':
Allow proguarding the main app and the test app in a single run.
Ben Cheng [Mon, 10 Feb 2014 12:50:55 +0000 (12:50 +0000)]
am
7495e68a: am
6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"
* commit '
7495e68a61075ef592aff6f2ba4d1d06fe3fedf4':
Refreshed gcc predefines __ANDROID__
Ying Wang [Mon, 10 Feb 2014 12:50:55 +0000 (12:50 +0000)]
am
34afc565: am
5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."
* commit '
34afc565b41989f07d6e479def5e849aeaad1ac9':
Select the arch_variant_cflags for the 2nd arch.
David 'Digit' Turner [Mon, 10 Feb 2014 12:10:22 +0000 (12:10 +0000)]
am
145562fc: Merge "Add missing font files to SDK system images."
* commit '
145562fcef979e4fea946987717618dba6148aeb':
Add missing font files to SDK system images.
David 'Digit' Turner [Mon, 10 Feb 2014 11:31:17 +0000 (11:31 +0000)]
Merge "Add missing font files to SDK system images."
Ying Wang [Sat, 8 Feb 2014 18:37:33 +0000 (18:37 +0000)]
am
2d72094f: am
960d919e: resolved conflicts for merge of
4df82b3e to klp-dev-plus-aosp
* commit '
2d72094f06e3cdfc78a3cfda9163cdb45ea7dbbb':
Allow proguarding the main app and the test app in a single run.
Ying Wang [Sat, 8 Feb 2014 18:35:13 +0000 (18:35 +0000)]
am
960d919e: resolved conflicts for merge of
4df82b3e to klp-dev-plus-aosp
* commit '
960d919e814726f05ad1a9b82e6a9677f9977f15':
Allow proguarding the main app and the test app in a single run.
Ying Wang [Sat, 8 Feb 2014 18:31:36 +0000 (10:31 -0800)]
resolved conflicts for merge of
4df82b3e to klp-dev-plus-aosp
Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
Ying Wang [Sat, 8 Feb 2014 18:26:38 +0000 (10:26 -0800)]
resolved conflicts for merge of
d616a73d to master
Change-Id: I92007bc1c4987c9601b5478b06e3bbe3c02b9535
Colin Cross [Sat, 8 Feb 2014 07:22:46 +0000 (07:22 +0000)]
am
ddd7c919: am
5e9a2033: Merge "don\'t rename 32-bit packages to *_32"
* commit '
ddd7c919d243bb73ce1590463af18c0f0f05c95a':
don't rename 32-bit packages to *_32
Ben Cheng [Fri, 7 Feb 2014 21:40:49 +0000 (21:40 +0000)]
am
6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"
* commit '
6c5d89764848b604c01d0dca7104d9e075aed2b2':
Refreshed gcc predefines __ANDROID__
Ben Cheng [Fri, 7 Feb 2014 21:36:45 +0000 (21:36 +0000)]
Merge "Refreshed gcc predefines __ANDROID__"
Ben Cheng [Fri, 7 Feb 2014 21:16:18 +0000 (13:16 -0800)]
Refreshed gcc predefines __ANDROID__
Change-Id: Id76f5a7490fba8190329e5ce3c4b138976a034ce
Ying Wang [Fri, 7 Feb 2014 20:37:28 +0000 (20:37 +0000)]
am
5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."
* commit '
5cc7f8a720fdeb2c2ec46b6ec212d05587e76163':
Select the arch_variant_cflags for the 2nd arch.
Ying Wang [Fri, 7 Feb 2014 20:32:01 +0000 (20:32 +0000)]
Merge "Select the arch_variant_cflags for the 2nd arch."
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
Adding SmsTest to sdk build
Change-Id: I42cf752e188ce579ecb9e9c6439d369bdbb0c177
Mihail Dumitrescu [Fri, 7 Feb 2014 15:18:59 +0000 (15:18 +0000)]
Allow proguarding the main app and the test app in a single run.
Bug:
12895101
Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
Ying Wang [Fri, 7 Feb 2014 18:40:37 +0000 (10:40 -0800)]
Select the arch_variant_cflags for the 2nd arch.
Change-Id: Id2f9d7073a4aae3ba0fe5e5464045761f4d42b4e
Ying Wang [Fri, 7 Feb 2014 18:09:13 +0000 (18:09 +0000)]
am
737a51dd: Merge "Refactor llvm_config.mk and support the 2nd arch"
* commit '
737a51dd7294b0443b4f1ac55372310d635c5121':
Refactor llvm_config.mk and support the 2nd arch
Ying Wang [Fri, 7 Feb 2014 18:03:33 +0000 (18:03 +0000)]
Merge "Refactor llvm_config.mk and support the 2nd arch"
Ying Wang [Fri, 7 Feb 2014 02:08:44 +0000 (18:08 -0800)]
Refactor llvm_config.mk and support the 2nd arch
1. Following the setup of gcc in build/core/combo/,
we added the [HOST|TARGET]_<arch>.mk clang config files,
and load only the configs needed by the current product.
2. Added support for the 2nd arch.
Change-Id: I2a383418a9688a050b39492f8e489d40eeeb5f2d
Colin Cross [Fri, 7 Feb 2014 07:53:23 +0000 (07:53 +0000)]
am
5e9a2033: Merge "don\'t rename 32-bit packages to *_32"
* commit '
5e9a20337e1110868296c27f201e4579e5e3fb9e':
don't rename 32-bit packages to *_32
Colin Cross [Fri, 7 Feb 2014 05:00:21 +0000 (05:00 +0000)]
Merge "don't rename 32-bit packages to *_32"
Colin Cross [Tue, 4 Feb 2014 19:16:16 +0000 (11:16 -0800)]
don't rename 32-bit packages to *_32
Renaming 32-bit packages to *_32 breaks PRODUCT_PACKAGES dependencies.
Change-Id: I5457c07b64885d77a6bd8fbcbba97d28393c581d
Elliott Hughes [Thu, 6 Feb 2014 21:03:37 +0000 (21:03 +0000)]
am
4d5fa510: am
8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
* commit '
4d5fa510977d8d698ec75d128efc4e71173ae697':
Turn 64-bit-related warnings into errors on 64-bit builds.
Elliott Hughes [Thu, 6 Feb 2014 20:59:33 +0000 (20:59 +0000)]
am
8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
* commit '
8b20d5b97e98ddac6031cb555078f425aef1da8f':
Turn 64-bit-related warnings into errors on 64-bit builds.
Elliott Hughes [Thu, 6 Feb 2014 20:54:04 +0000 (20:54 +0000)]
Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
Elliott Hughes [Thu, 6 Feb 2014 20:29:48 +0000 (20:29 +0000)]
am
3f040869: am
efb9603a: Merge "[MIPS64] Add mips64 target"
* commit '
3f0408695b23a8d21c3227ae845006381b26f666':
[MIPS64] Add mips64 target
Elliott Hughes [Thu, 6 Feb 2014 20:21:41 +0000 (20:21 +0000)]
am
efb9603a: Merge "[MIPS64] Add mips64 target"
* commit '
efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
[MIPS64] Add mips64 target
Elliott Hughes [Thu, 6 Feb 2014 20:14:55 +0000 (20:14 +0000)]
Merge "[MIPS64] Add mips64 target"
Ying Wang [Thu, 6 Feb 2014 18:11:51 +0000 (18:11 +0000)]
am
69c3f457: am
dc7fee9f: Set up rules to merge AndroidManifest.xmls
* commit '
69c3f4570d80eab99bfcab604209dc7bb3ae5537':
Set up rules to merge AndroidManifest.xmls
Ying Wang [Thu, 6 Feb 2014 18:07:51 +0000 (18:07 +0000)]
am
dc7fee9f: Set up rules to merge AndroidManifest.xmls
* commit '
dc7fee9fbf46ac06c840c7edfd51fbefeece63e4':
Set up rules to merge AndroidManifest.xmls
Andreas Huber [Thu, 6 Feb 2014 17:28:00 +0000 (09:28 -0800)]
fix the build, libstagefright_chromium_http is no longer needed.
Change-Id: I1777b3e9157a4bdb868b9e14cc62422b1e017c5d
Chris Dearman [Mon, 3 Feb 2014 23:01:24 +0000 (15:01 -0800)]
[MIPS64] Add mips64 target
Change-Id: Ice1621101c0d5a3314db288542ca8020e3f406bf
Signed-off-by: Duane Sand <duane.sand@imgtec.com>
Christopher Ferris [Thu, 6 Feb 2014 03:07:49 +0000 (03:07 +0000)]
am
6d0899ea: am
afbbce3f: Merge "Add library test makefile solutions."
* commit '
6d0899ea4735293cca61661366dd98917f200bb3':
Add library test makefile solutions.
Christopher Ferris [Thu, 6 Feb 2014 02:59:39 +0000 (02:59 +0000)]
am
afbbce3f: Merge "Add library test makefile solutions."
* commit '
afbbce3ff1d2d94e54f48d748d18796ce671fce9':
Add library test makefile solutions.
Ying Wang [Thu, 6 Feb 2014 02:24:45 +0000 (18:24 -0800)]
Set up rules to merge AndroidManifest.xmls
Now you can merge the library manifest files to the main app's
AndroidManifest.xml with LOCAL_FULL_LIBS_MANIFEST_FILES.
LOCAL_FULL_LIBS_MANIFEST_FILES is a list of paths relative to the top of
the source tree.
Bug:
12907528
Change-Id: I16a347c83dfb6fbbb7d5d40284b7c65aa682fdd2
Christopher Ferris [Thu, 6 Feb 2014 02:16:35 +0000 (02:16 +0000)]
Merge "Add library test makefile solutions."
Elliott Hughes [Thu, 6 Feb 2014 00:23:47 +0000 (16:23 -0800)]
Turn 64-bit-related warnings into errors on 64-bit builds.
I don't think we can realistically turn this on for 32-bit builds any
time soon.
Also, fix the arm64 stack-protector hack.
Change-Id: Ie1e7c875bbc06fb21bb372b8ca99879a23ef53d4
Christopher Ferris [Wed, 5 Feb 2014 06:09:16 +0000 (22:09 -0800)]
Add library test makefile solutions.
Change-Id: Ibc8df9b0e2342683158936bf011425780df8f02a
Colin Cross [Thu, 6 Feb 2014 00:06:30 +0000 (00:06 +0000)]
am
d69ed2e2: am
054b0274: Merge topic \'arm64\'
* commit '
d69ed2e25c59803bbbbbee7c09551efb3ed0c49d':
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
Colin Cross [Thu, 6 Feb 2014 00:06:30 +0000 (00:06 +0000)]
am
dc5249ab: am
717de0f5: Merge "Fix installing 2nd arch shared libraries"
* commit '
dc5249ab3c82040e21269fb69dc9a6dc89224629':
Fix installing 2nd arch shared libraries
Colin Cross [Thu, 6 Feb 2014 00:01:38 +0000 (00:01 +0000)]
am
054b0274: Merge topic \'arm64\'
* commit '
054b0274fc27babb42a60002ad25c9e608eac257':
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
Colin Cross [Thu, 6 Feb 2014 00:01:37 +0000 (00:01 +0000)]
am
717de0f5: Merge "Fix installing 2nd arch shared libraries"
* commit '
717de0f553dc3c1a2baa0cc988af1adc5b26dba8':
Fix installing 2nd arch shared libraries
Colin Cross [Wed, 5 Feb 2014 23:57:08 +0000 (23:57 +0000)]
Merge topic 'arm64'
* changes:
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
Colin Cross [Wed, 5 Feb 2014 23:55:54 +0000 (23:55 +0000)]
Merge "Fix installing 2nd arch shared libraries"
Ying Wang [Wed, 5 Feb 2014 20:15:06 +0000 (12:15 -0800)]
Fix typo.
Change-Id: I01a1762fe449e02ff80a5ea7a3ee1c529e5da902
Ying Wang [Wed, 5 Feb 2014 19:28:51 +0000 (11:28 -0800)]
Fix emulator builds
which don't have boot.img.
Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
Colin Cross [Tue, 4 Feb 2014 22:53:25 +0000 (14:53 -0800)]
add support for more LOCAL_*_arch variables
Add support for:
LOCAL_SHARED_LIBRARIES_arch
LOCAL_STATIC_LIBRARIES_arch
LOCAL_WHOLE_STATIC_LIBRARIES_arch
LOCAL_GENERATED_SOURCES_arch
LOCAL_REQUIRED_MODULES_arch
Change-Id: Iad91702e140d8dba7dcaee13f236c77b1e626a34
Colin Cross [Wed, 5 Feb 2014 03:42:32 +0000 (19:42 -0800)]
Fix installing 2nd arch shared libraries
2ND_TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES was not set,
which was causing the later += to act like = instead of
:=, and the dependencies would disappear as soon as
LOCAL_MODULE was cleared.
Change-Id: Idea291524fc06377deafec62f37d20eaa7f93bca
Colin Cross [Tue, 4 Feb 2014 19:16:16 +0000 (11:16 -0800)]
don't rename 32-bit executables to *_32
Renaming 32-bit executables to *_32 breaks PRODUCT_PACKAGES
dependencies.
Change-Id: I53d89991633ef4af03c4e618c463769937a70e38
Colin Cross [Tue, 4 Feb 2014 19:15:26 +0000 (11:15 -0800)]
remove 2nd arch from ARCH_ARM_* defines
Users of ARCH_ARM_* defines don't care about first vs. second arch,
set ARCH_ARM_* regardless of which arch is arm.
Change-Id: I2ae83ec5c3f839ff91a0e352c95d76ec2cbd5dc5
Adam Lesinski [Wed, 5 Feb 2014 00:56:13 +0000 (00:56 +0000)]
am
bebb2b54: am
7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
* commit '
bebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0':
Allow multiple asset directories in aapt
Adam Lesinski [Wed, 5 Feb 2014 00:49:37 +0000 (00:49 +0000)]
am
7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
* commit '
7b734fd8d163f7a71254b909fbbcd358129924b7':
Allow multiple asset directories in aapt
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 23:42:07 +0000 (23:42 +0000)]
am
bbfebfad: resolved conflicts for merge of
303d2755 to klp-modular-dev-plus-aosp
* commit '
bbfebfad0d8ad002995bb1005b61a35b42a8ce35':
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
Justin Koh [Tue, 4 Feb 2014 23:16:15 +0000 (15:16 -0800)]
resolved conflicts for merge of
303d2755 to klp-modular-dev-plus-aosp
Change-Id: I653cac50cf71b75d47974dde833468fa61024ae9