OSDN Git Service
Dirk Dougherty [Sat, 15 Feb 2014 18:20:12 +0000 (18:20 +0000)]
am
98756f3b: am
8a56079c: am
5c92d966: am
541b4941: New temporary templates set for dynamic content support.
* commit '
98756f3b7e16558ae4e17891237163ab8a23c462':
New temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 18:16:51 +0000 (18:16 +0000)]
am
8a56079c: am
5c92d966: am
541b4941: New temporary templates set for dynamic content support.
* commit '
8a56079c74765afa405a96bd025f2bddac4e17b6':
New temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 18:14:37 +0000 (18:14 +0000)]
am
5c92d966: am
541b4941: New temporary templates set for dynamic content support.
* commit '
5c92d966076b28024a9efd6c8456445e207748f1':
New temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 18:12:08 +0000 (18:12 +0000)]
am
541b4941: New temporary templates set for dynamic content support.
* commit '
541b494103857da31505ba745b0da5bdbe0499b9':
New temporary templates set for dynamic content support.
Dirk Dougherty [Sat, 15 Feb 2014 02:31:53 +0000 (18:31 -0800)]
New temporary templates set for dynamic content support.
Change-Id: I066e43cdebaf66c0d8b5e3622a286dc2c88c47b5
Ying Wang [Fri, 14 Feb 2014 23:08:08 +0000 (23:08 +0000)]
am
872d3c2c: Merge "gettop: fix symlink detection"
* commit '
872d3c2c6a07e4f1c171439449727a870dfaa59d':
gettop: fix symlink detection
Stephen Hines [Fri, 14 Feb 2014 23:07:59 +0000 (23:07 +0000)]
am
051e28fe: Merge "Fix incorrect x86 build rules."
* commit '
051e28fe2128a284ec7987f903f02b9f5826391b':
Fix incorrect x86 build rules.
Ying Wang [Fri, 14 Feb 2014 21:20:17 +0000 (21:20 +0000)]
Merge "gettop: fix symlink detection"
Stephen Hines [Fri, 14 Feb 2014 20:32:29 +0000 (20:32 +0000)]
Merge "Fix incorrect x86 build rules."
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: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: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: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"
Stephen Hines [Thu, 13 Feb 2014 11:21:12 +0000 (03:21 -0800)]
Fix incorrect x86 build rules.
combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their
linker command lines. This results in clang builds not working properly,
since they strip some unknown flags from TARGET_GLOBAL_CFLAGS.
Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
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 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.
Colin Cross [Wed, 12 Feb 2014 20:57:24 +0000 (20:57 +0000)]
Merge topic 'arm64'
* changes:
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
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
Colin Cross [Fri, 24 Jan 2014 21:38:08 +0000 (13:38 -0800)]
HACK: add 64-bit directory blacklist
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
Colin Cross [Thu, 6 Feb 2014 22:45:37 +0000 (14:45 -0800)]
add support for module supported or unsupported target architectures
Add four new variables for module makefiles:
LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for
one or more architectures. Any architecture not in the list will be
not attempt to build the module. The expected use case is prebuilts
that are only suitable for a single architecture, or modules like llvm
that need per-architecture support.
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be
built for one or more architectures.
LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN
are the same, but warn that the arch is not supported, which is useful
for modules that are critical but not yet working.
The logic for whether or not to build an architecture is fairly
complicated, so this patch consolidates it into module_arch_supported.mk
Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
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: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: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: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 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
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
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."
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 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: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:07:51 +0000 (18:07 +0000)]
am
dc7fee9f: Set up rules to merge AndroidManifest.xmls
* commit '
dc7fee9fbf46ac06c840c7edfd51fbefeece63e4':
Set up rules to merge AndroidManifest.xmls
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 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: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"
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