OSDN Git Service
Primiano Tucci [Tue, 3 Jun 2014 09:29:50 +0000 (09:29 +0000)]
Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
Ying Wang [Tue, 3 Jun 2014 01:22:51 +0000 (01:22 +0000)]
am
40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '
40b7e34240be756bbf1542b63eef6332024d067e':
Move sdk staging dir to a product-specific dir
Ying Wang [Tue, 3 Jun 2014 01:20:29 +0000 (01:20 +0000)]
Merge "Move sdk staging dir to a product-specific dir"
Ying Wang [Mon, 2 Jun 2014 23:16:53 +0000 (16:16 -0700)]
Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.
Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
Nick Kralevich [Mon, 2 Jun 2014 19:25:21 +0000 (19:25 +0000)]
am
c706ea79: Merge "Include selinux_version file with builds."
* commit '
c706ea79629792f4432774643887f5681e8f145d':
Include selinux_version file with builds.
Nick Kralevich [Mon, 2 Jun 2014 19:23:11 +0000 (19:23 +0000)]
Merge "Include selinux_version file with builds."
Primiano Tucci [Mon, 2 Jun 2014 16:37:38 +0000 (17:37 +0100)]
Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)
Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
Stephen Hines [Fri, 30 May 2014 23:04:37 +0000 (23:04 +0000)]
am
a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '
a8b65126cae5335d4c8b31fbf7700907fd2c48dd':
Add -shared to clang LDFLAGS.
Stephen Hines [Fri, 30 May 2014 22:59:48 +0000 (22:59 +0000)]
Merge "Add -shared to clang LDFLAGS."
Nick Kralevich [Fri, 30 May 2014 22:56:11 +0000 (22:56 +0000)]
am
a42e0f50: Merge "arm64: restore relro/now"
* commit '
a42e0f50162721bc54c113ef1ed3058cfb38ae67':
arm64: restore relro/now
Nick Kralevich [Fri, 30 May 2014 22:52:34 +0000 (22:52 +0000)]
Merge "arm64: restore relro/now"
Nick Kralevich [Fri, 30 May 2014 22:45:24 +0000 (15:45 -0700)]
arm64: restore relro/now
The bug which required this option has been fixed.
Bug:
11434996
Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef
Nick Kralevich [Fri, 30 May 2014 18:23:41 +0000 (18:23 +0000)]
am
61cf065a: Merge "Use a separate policy for the recovery image."
* commit '
61cf065ae9247a200208dc7df0234e03caff3605':
Use a separate policy for the recovery image.
Nick Kralevich [Fri, 30 May 2014 18:20:48 +0000 (18:20 +0000)]
Merge "Use a separate policy for the recovery image."
Andrew Hsieh [Fri, 30 May 2014 07:46:14 +0000 (07:46 +0000)]
am
5c2c70de: Merge "Add -latomic to all target builds"
* commit '
5c2c70de88a6c126460c88cfa64561d7cb2cc030':
Add -latomic to all target builds
Andrew Hsieh [Fri, 30 May 2014 07:44:00 +0000 (07:44 +0000)]
Merge "Add -latomic to all target builds"
Tim Murray [Thu, 29 May 2014 22:10:44 +0000 (15:10 -0700)]
Add -shared to clang LDFLAGS.
TOT clang doesn't do the right thing with regards to -pie without this.
Change-Id: Ic14cfb25d96359eb18899c09ebaf1d311e937d01
Stephen Smalley [Thu, 29 May 2014 20:41:03 +0000 (16:41 -0400)]
Use a separate policy for the recovery image.
Only the recovery image needs to include the recovery domain
in its policy, so create a separate policy for the recovery image
and replace the root policy with this one when building the
recovery image.
Depends on the change with the same Change-Id in external/sepolicy.
Change-Id: I444107f9821eabf4164ba07a44d03bd71e719989
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Dave Allison [Thu, 29 May 2014 19:57:50 +0000 (19:57 +0000)]
am
2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
* commit '
2a2ba735df028a6168368a399b6df27a6ec33fa4':
Add libsigchain to the embedded.mk makefile
Dave Allison [Thu, 29 May 2014 19:51:50 +0000 (19:51 +0000)]
Merge "Add libsigchain to the embedded.mk makefile"
Brian Carlstrom [Thu, 29 May 2014 19:40:02 +0000 (19:40 +0000)]
am
e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit '
e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
Only enable WITH_DEXPREOPT by default for libdvm.so
Brian Carlstrom [Thu, 29 May 2014 19:39:49 +0000 (19:39 +0000)]
am
f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
f2a2406b8c01e71603feaa5eaccd75d26ea76804':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 19:36:37 +0000 (19:36 +0000)]
Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
Brian Carlstrom [Thu, 29 May 2014 19:36:35 +0000 (19:36 +0000)]
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
Andrew Hsieh [Thu, 29 May 2014 09:47:27 +0000 (02:47 -0700)]
Add -latomic to all target builds
Projects using stdatomic.h needs libatomic.a in case compiler can't
expand all __atomic* intrinsics. eg, __atomic_is_lock_free in
armeabi/mips.
Adding libatomic.a globally makes more sense than adding
"LOCAL_LDLIB += -latomic " in each project including <stdatomic.h>.
Projects don't need atomic operations won't get redundant DT_NEEDED
entry because libatomic.a is not a shared library.
Change-Id: I81dbf524544c848e667e18ab5eeabff75b5063ef
Brian Carlstrom [Thu, 29 May 2014 05:13:07 +0000 (22:13 -0700)]
Only enable WITH_DEXPREOPT by default for libdvm.so
Bug:
14298175
(cherry picked from commit
9f8e214a919097284a88cb19a1b85ceafc202a67)
Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
(cherry picked from commit
bf8a374a92e327efed95892fe67e6917a89c6c2b)
Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
Ying Wang [Wed, 28 May 2014 23:38:46 +0000 (23:38 +0000)]
am
b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."
* commit '
b3bed5952b44e69dc9e1988beb4092303084ef61':
Add a dummy build recipe for generated RS cpp files.
Ying Wang [Wed, 28 May 2014 23:33:35 +0000 (23:33 +0000)]
Merge "Add a dummy build recipe for generated RS cpp files."
Ying Wang [Wed, 28 May 2014 23:28:58 +0000 (23:28 +0000)]
am
65afd710: Merge "Add a dummy build recipe for the proto generated header files"
* commit '
65afd710a592390671beb5da15a87b127a5f2125':
Add a dummy build recipe for the proto generated header files
Ying Wang [Wed, 28 May 2014 23:26:01 +0000 (23:26 +0000)]
Merge "Add a dummy build recipe for the proto generated header files"
Ying Wang [Wed, 28 May 2014 23:17:09 +0000 (16:17 -0700)]
Add a dummy build recipe for generated RS cpp files.
Previously the RS cpp files are generated by the timestamp rule. Though
we have the generated RS cpp files depend on the timestamp file, we
don't have a build recipe. In such case gmake does some "optimization"
that it skip recompiling the generated cpp files, because it assumes the
generated cpp files are already up to date even if the rs files have
been updated.
Bug:
15313144
Change-Id: Ie69ecd2c788057d3619f9c7d2a125d44c4a534a1
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
Brian Carlstrom [Wed, 28 May 2014 22:31:44 +0000 (22:31 +0000)]
am
7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:35 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:46 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
7e127ebe0bf8753fcbeeac6140916d512322e308)
Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
Ying Wang [Wed, 28 May 2014 21:28:42 +0000 (21:28 +0000)]
am
f4999d3b: Merge "Fix pattern rules for for libdvm."
* commit '
f4999d3b8a0d09e790767176c543df1c2ad53c5a':
Fix pattern rules for $(installed_odex) for libdvm.
Ying Wang [Wed, 28 May 2014 21:25:34 +0000 (21:25 +0000)]
Merge "Fix pattern rules for $(installed_odex) for libdvm."
Ying Wang [Wed, 28 May 2014 20:34:59 +0000 (13:34 -0700)]
Fix pattern rules for $(installed_odex) for libdvm.
When the VM is libdvm, we don't put the odex files in an arch specific
subdirectory. The previous pattern rules don't work because of the extra
"/". With this change, % evaluates to empty string when it's built for
libdvm; % evaluates to "<arch_name>/" when it's built for libart.
Also removed use of $(create-empty-package), which may causes file name
(dummy) conflict with the rule of package.apk.
Bug:
15311527
Change-Id: I9f9089bc1896b78c1f47834afdb28a3a51d34480
Ying Wang [Wed, 28 May 2014 16:14:54 +0000 (16:14 +0000)]
am
aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix."
* commit '
aae7e3fa66ecf6bf796ba9a107d8f066498ab10b':
Support LOCAL_CLANG with arch/bit suffix.
Ying Wang [Wed, 28 May 2014 16:12:39 +0000 (16:12 +0000)]
Merge "Support LOCAL_CLANG with arch/bit suffix."
Elliott Hughes [Wed, 28 May 2014 04:04:36 +0000 (04:04 +0000)]
am
4afe808c: Merge "Fix all the system image sizes."
* commit '
4afe808c640ac2bfdd1e665d322b7c9fbe38a974':
Fix all the system image sizes.
Elliott Hughes [Wed, 28 May 2014 04:01:52 +0000 (04:01 +0000)]
Merge "Fix all the system image sizes."
Elliott Hughes [Tue, 27 May 2014 23:47:44 +0000 (16:47 -0700)]
Fix all the system image sizes.
x86 just bit me. I did manage to build mips today, but I assume it
can't be long before we hit the limit there too if every other target
has hit it already.
Change-Id: I28dfe3b4f9565cb79e0bf6b0ffc55a9d6e64a9b0
Ying Wang [Tue, 27 May 2014 20:03:36 +0000 (13:03 -0700)]
Support LOCAL_CLANG with arch/bit suffix.
Precedence: LOCAL_CLANG_<arch> > LOCAL_CLANG_<32|64> > LOCAL_CLANG.
Bug:
15257067
Change-Id: I86b72f3bec162834591287d3b5231b5f40f9a431
Dan Albert [Tue, 27 May 2014 19:44:19 +0000 (19:44 +0000)]
am
3805f619: Merge "Revert "Fix for duplicate names in whole static libs""
* commit '
3805f619156163eab8ad92fd51b4a431be1287bd':
Revert "Fix for duplicate names in whole static libs"
Dan Albert [Tue, 27 May 2014 19:41:46 +0000 (19:41 +0000)]
Merge "Revert "Fix for duplicate names in whole static libs""
Dan Albert [Tue, 27 May 2014 19:30:36 +0000 (19:30 +0000)]
Revert "Fix for duplicate names in whole static libs"
This reverts commit
0e5ce8be34446278a3404ea2a4afc01f20f86c5a.
Change-Id: I68b776cb915fd7be8299ddb2899907046dddadf3
Dan Albert [Tue, 27 May 2014 18:26:38 +0000 (18:26 +0000)]
am
31101623: Merge "Fix for duplicate names in whole static libs"
* commit '
31101623b3e621436f6b46f49242ed4642d86164':
Fix for duplicate names in whole static libs
Dan Albert [Tue, 27 May 2014 18:23:26 +0000 (18:23 +0000)]
Merge "Fix for duplicate names in whole static libs"
Ying Wang [Tue, 27 May 2014 17:52:10 +0000 (17:52 +0000)]
am
294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested."
* commit '
294301bb34b62d51305d70780ac031a905fa9efe':
Exclude libstdc++ and libgcc if libc++ is requested.
Ying Wang [Tue, 27 May 2014 17:49:12 +0000 (17:49 +0000)]
Merge "Exclude libstdc++ and libgcc if libc++ is requested."
Narayan Kamath [Tue, 27 May 2014 11:15:57 +0000 (11:15 +0000)]
am
8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
* commit '
8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
Switch x86_64 emulator to 64 bit primary.
Narayan Kamath [Tue, 27 May 2014 11:15:56 +0000 (11:15 +0000)]
am
7b31bd3e: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
* commit '
7b31bd3e8f25b9b232204d4b64399d78d6e41163':
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
Narayan Kamath [Tue, 27 May 2014 11:13:42 +0000 (11:13 +0000)]
Merge "Switch x86_64 emulator to 64 bit primary."
Narayan Kamath [Tue, 27 May 2014 11:12:33 +0000 (11:12 +0000)]
Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
Narayan Kamath [Wed, 21 May 2014 11:44:37 +0000 (12:44 +0100)]
Switch x86_64 emulator to 64 bit primary.
Also siezes the opportunity to remove the hardcoded
TARGET_PREFER_32_BIT_APPS directing in core_64_bit.mk.
This avoids the need for further hacks but needs supporting
changes to a few apps to force them to 32 bit.
Change-Id: I36ba9e5f5b08dd87d6a4afc27961a436306eed99
Narayan Kamath [Tue, 6 May 2014 14:14:09 +0000 (15:14 +0100)]
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
This isn't required any longer, besides individual products
should be allowed to set this value themselves.
(cherry picked from commit
7b9347a7f9d870e149ef38438ad547abe2709ee2)
Change-Id: If459eab32c6e7831596224ad3503baefbf028133
Dan Albert [Fri, 23 May 2014 17:41:29 +0000 (10:41 -0700)]
Fix for duplicate names in whole static libs
_extract-and-include-single-(host|target)-whole-static-lib was written such that
only the first file of a given name would be extracted and included into the new
library. This patch iterates over each identically named archive member,
extracts them individually, and adds them to the new archive.
Bug:
15110069
Change-Id: Ia08c7be6f40bfc8403908a8808898ada479099b1
Ying Wang [Fri, 23 May 2014 23:42:37 +0000 (16:42 -0700)]
Exclude libstdc++ and libgcc if libc++ is requested.
Bug:
15174002
Change-Id: I24fe428c3520f76cd61f0660b59ba18a1f2d2dad
Ying Wang [Fri, 23 May 2014 17:44:31 +0000 (17:44 +0000)]
am
6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
* commit '
6cb69bd4f20ac3ae3a7d5b5cc323c4480cf8ef75':
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
Ying Wang [Fri, 23 May 2014 17:39:40 +0000 (17:39 +0000)]
Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"
Colin Cross [Thu, 22 May 2014 19:31:26 +0000 (19:31 +0000)]
am
e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '
e45c8607b3e2cf7a428a91898aea2752a54389a1':
set a prebuilt directory name for the 2nd arch
add vendor directories to gdb shared library search path
add 2nd arch gcc to the path
fix paths when 2nd arch gcc is a different version
Colin Cross [Thu, 22 May 2014 19:28:01 +0000 (19:28 +0000)]
Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* changes:
set a prebuilt directory name for the 2nd arch
add vendor directories to gdb shared library search path
add 2nd arch gcc to the path
fix paths when 2nd arch gcc is a different version
Colin Cross [Thu, 22 May 2014 19:01:23 +0000 (12:01 -0700)]
set a prebuilt directory name for the 2nd arch
In order to install 32-bit gdbserver on a 64-bit build,
prebuilts/misc/Android.mk needs to know the prebuilt directory name
for the 2nd arch.
Change-Id: Ibc943b758eb9404f7f5f9fbbd8720cc67f6a6f01
Colin Cross [Thu, 22 May 2014 18:59:10 +0000 (11:59 -0700)]
add vendor directories to gdb shared library search path
Change-Id: Ib4ccf3739d6b2f14597605ce06f00e4776f67976
Colin Cross [Thu, 22 May 2014 18:58:40 +0000 (11:58 -0700)]
add 2nd arch gcc to the path
Add the 2nd arch gcc to the path so users can manually run gdb,
addr2line, objdump, etc.
Change-Id: I30ff439bb6548b897d13bfa87151991d5f2948b3
Colin Cross [Thu, 22 May 2014 18:57:43 +0000 (11:57 -0700)]
fix paths when 2nd arch gcc is a different version
arm64 is using gcc 4.9, arm is using gcc 4.8. Fix setpaths() to
get a separate version for the 2nd arch.
Change-Id: I7bde01308fc7718360e7d0fbd46b3ae8c5f55fa7
Ying Wang [Thu, 22 May 2014 17:43:14 +0000 (17:43 +0000)]
am
b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
* commit '
b0143e2fffbd3183175e8c1873d3466598ca9457':
Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
Ying Wang [Thu, 22 May 2014 17:38:01 +0000 (17:38 +0000)]
Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"
Ying Wang [Thu, 22 May 2014 02:29:52 +0000 (02:29 +0000)]
am
8a3f514d: Merge "Split the rules to build the odex file"
* commit '
8a3f514d44e2c1d4920126b3edd47f7a7616b732':
Split the rules to build the odex file
Ying Wang [Thu, 22 May 2014 02:24:59 +0000 (02:24 +0000)]
Merge "Split the rules to build the odex file"
Dmitriy Ivanov [Thu, 22 May 2014 01:24:48 +0000 (01:24 +0000)]
am
5caca89c: Merge "Clarify multiarch warnings"
* commit '
5caca89c5d66e9999e26905522bf2eed958d0961':
Clarify multiarch warnings
Dmitriy Ivanov [Thu, 22 May 2014 01:22:00 +0000 (01:22 +0000)]
Merge "Clarify multiarch warnings"
Dmitriy Ivanov [Wed, 21 May 2014 23:38:03 +0000 (16:38 -0700)]
Clarify multiarch warnings
* Show multiarch related warnings only if my_module_multilib is both
Change-Id: If0c467c1d9b953bd3f40949ab4b97d9329ec021f
Ying Wang [Wed, 21 May 2014 23:13:33 +0000 (16:13 -0700)]
Split the rules to build the odex file
Previously the odex file is byproduct generated by the package.apk rule.
Though we have the odex file depend on the package.apk it doesn't have
its own build recipe. In case package.apk isn't updated but we still
need to update the odex file (such as changed LOCAL_MULTILIB), the odex
file will never be rebuilt.
This change split out the rules to build the odex file and make sure the
build recipe get executed if the odex file needs rebuild.
Change-Id: I60c2f32b536b3d59045301ee863aae1451734aad
Mark Salyzyn [Wed, 21 May 2014 21:08:24 +0000 (21:08 +0000)]
am
ea65c191: Merge "libctest: zap"
* commit '
ea65c191e7c08233c97c5b854537d2a0d2127733':
libctest: zap
Mark Salyzyn [Wed, 21 May 2014 21:02:10 +0000 (21:02 +0000)]
Merge "libctest: zap"
Mark Salyzyn [Wed, 21 May 2014 20:27:58 +0000 (13:27 -0700)]
libctest: zap
Change-Id: Ia3ff0cad0995af428adf2dbdf10587dae904ec7d
Sreeram Ramachandran [Wed, 21 May 2014 17:01:40 +0000 (17:01 +0000)]
am
90a0edbc: Merge "Remove netd_client. It has moved to the internal tree."
* commit '
90a0edbc0b6dfee222ff630973308c737202a6b7':
Remove netd_client. It has moved to the internal tree.
Sreeram Ramachandran [Wed, 21 May 2014 16:59:25 +0000 (16:59 +0000)]
Merge "Remove netd_client. It has moved to the internal tree."
Sreeram Ramachandran [Wed, 21 May 2014 16:55:44 +0000 (09:55 -0700)]
Remove netd_client. It has moved to the internal tree.
Change-Id: Iffcdb4900373c05086fd1085b861b6520065b7a3
Ying Wang [Wed, 21 May 2014 01:06:03 +0000 (01:06 +0000)]
am
4e151105: Merge "Support to extract JNI libs from prebuilt APK"
* commit '
4e151105a02ba09acb277c6a084252d01c561a5f':
Support to extract JNI libs from prebuilt APK
Ying Wang [Tue, 20 May 2014 21:43:51 +0000 (14:43 -0700)]
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
We already support pure 32-bit and 64-bit-by-default multilib build.
With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build.
This will be lest disruptive during the period we transition to
64-bit-by-default.
Bug:
13751317
Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
Ying Wang [Wed, 21 May 2014 01:02:57 +0000 (01:02 +0000)]
Merge "Support to extract JNI libs from prebuilt APK"
Ying Wang [Sat, 19 Apr 2014 03:13:41 +0000 (20:13 -0700)]
Support to extract JNI libs from prebuilt APK
Use LOCAL_PREBUILT_JNI_LIBS to install prebuilt JNI libraries extracted
from the prebuilt apk, or prebuilts as source, to the app specific lib path.
LOCAL_PREBUILT_JNI_LIBS accepts 2 kinds of files:
- Files like @path/to/libfoo.so (path inside the apk) are JNI libs
extracted from the prebuilt apk. In this case, all embedded JNI libs
inside the prebuilt apk are stripped.
- Files like path/to/libfoo.so (path relative to LOCAL_PATH) are
prebuilts in the source tree.
Those prebuilt JNI libs are not defined as modules in the build system,
so this works around possible module name conflict.
Bug:
13170859
Change-Id: I91bb844cc11b3621a85733bc7e8910f168957ef0
Elliott Hughes [Tue, 20 May 2014 23:36:30 +0000 (23:36 +0000)]
am
0dbcff95: Merge "The generic_arm64 system image is full."
* commit '
0dbcff9599be1f999df467b7d17b4f2785a8452a':
The generic_arm64 system image is full.
Christopher Ferris [Tue, 20 May 2014 23:36:28 +0000 (23:36 +0000)]
am
a2cd924b: Merge "Fix extra/missing : in path setup."
* commit '
a2cd924bef556cb6ceccca1098cae338d37200a6':
Fix extra/missing : in path setup.
Elliott Hughes [Tue, 20 May 2014 21:48:10 +0000 (21:48 +0000)]
Merge "The generic_arm64 system image is full."
Elliott Hughes [Tue, 20 May 2014 21:37:51 +0000 (14:37 -0700)]
The generic_arm64 system image is full.
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
Christopher Ferris [Tue, 20 May 2014 21:18:50 +0000 (21:18 +0000)]
Merge "Fix extra/missing : in path setup."
Christopher Ferris [Tue, 20 May 2014 20:56:00 +0000 (13:56 -0700)]
Fix extra/missing : in path setup.
Change-Id: I4d95efc781c58af704012922d95841e009bf6286
Ben Cheng [Tue, 20 May 2014 16:04:17 +0000 (16:04 +0000)]
am
54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
* commit '
54bea362ab7f33791bd6ea54d77a76dc8d9e005d':
Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
Ben Cheng [Tue, 20 May 2014 16:00:07 +0000 (16:00 +0000)]
Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
Ben Cheng [Mon, 19 May 2014 23:22:21 +0000 (16:22 -0700)]
Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7
NDK libraries are still picked up from prebuilts/ndk/*/4.8/*
GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.
Source code has been sync'ed against the 2014-05-14 snapshot which
contains many important fixes (devirtualization, codegen, ...).
Change-Id: I43229360ad0132193d5208cb0d1acba55084853c
Brian Carlstrom [Mon, 19 May 2014 16:53:35 +0000 (16:53 +0000)]
am
64f3a191: Merge "Multilib support for odex"
* commit '
64f3a191f92a6ab84a8175ad480633b8c58ac900':
Multilib support for odex
Brian Carlstrom [Mon, 19 May 2014 16:50:16 +0000 (16:50 +0000)]
Merge "Multilib support for odex"
Ji-Hwan Lee [Mon, 19 May 2014 16:48:51 +0000 (16:48 +0000)]
am
13b48588: Merge "Allow qemu_device read-write access to various processes"
* commit '
13b485889d95597a839f27f7774d55142bb8b5a7':
Allow qemu_device read-write access to various processes
Ji-Hwan Lee [Mon, 19 May 2014 16:46:30 +0000 (16:46 +0000)]
Merge "Allow qemu_device read-write access to various processes"
Ji-Hwan Lee [Mon, 19 May 2014 11:43:23 +0000 (20:43 +0900)]
Allow qemu_device read-write access to various processes
Basically, allow access of qemu_device where gpu_device is allowed, for the
case when the emulator runs with OpenGL/ES emulation. Most noticably,
surfaceflinger crashes without qemu_device access.
Bug:
15052949
Change-Id: Ib891365a6d503309bced64e2512c4d8f29d9a07e