diff options
author | Ying Wang <wangying@google.com> | 2014-06-24 20:01:52 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2014-06-25 09:07:01 -0700 |
commit | 8e20ef6205b3c96135b1c1e4484d523dbecb1b98 (patch) | |
tree | 506b1e36c6460dba960e092d3414d3a65b4f17f9 /core/prebuilt_internal.mk | |
parent | b0c6ea9f290261c12b6cb127b7bcd53f8ecc2d60 (diff) | |
download | build-8e20ef6205b3c96135b1c1e4484d523dbecb1b98.zip build-8e20ef6205b3c96135b1c1e4484d523dbecb1b98.tar.gz build-8e20ef6205b3c96135b1c1e4484d523dbecb1b98.tar.bz2 |
Support to add JNI of both archs in multilib build.
Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.
Bug: 15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
Diffstat (limited to 'core/prebuilt_internal.mk')
-rw-r--r-- | core/prebuilt_internal.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 4bcd70a..b5e5189 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -165,7 +165,7 @@ include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk # Sign and align non-presigned .apks. $(built_module) : $(my_prebuilt_src_file) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR) $(transform-prebuilt-to-target) -ifdef my_extracted_jni_libs +ifdef extracted_jni_libs $(hide) zip -d $@ 'lib/*.so' # strip embedded JNI libraries. endif ifneq ($(LOCAL_CERTIFICATE),PRESIGNED) |