diff options
| author | Ying Wang <wangying@google.com> | 2014-04-19 00:05:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-19 00:05:09 +0000 |
| commit | fff7583f868a7de1eeeee22f141184e86b5e664b (patch) | |
| tree | 534440238c9920005a5b9d0bc94e467c874379ba /core/package_internal.mk | |
| parent | 29eb3d09c83c71e3178b027f9bcc5b4e4d75ca47 (diff) | |
| parent | a59c2935bc63babded85aa1ce1a8b00e28dc6a11 (diff) | |
| download | build-fff7583f868a7de1eeeee22f141184e86b5e664b.zip build-fff7583f868a7de1eeeee22f141184e86b5e664b.tar.gz build-fff7583f868a7de1eeeee22f141184e86b5e664b.tar.bz2 | |
am a59c2935: am 488b23d9: Merge "Update rules to install JNI libraries."
* commit 'a59c2935bc63babded85aa1ce1a8b00e28dc6a11':
Update rules to install JNI libraries.
Diffstat (limited to 'core/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 9f8c35d..5771e98 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -296,50 +296,7 @@ $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex) $(LOCAL_BUILT_MODULE): $(built_dex) endif # full_classes_jar - -# Get the list of jni libraries to be included in the apk file. - -so_suffix := $($(my_prefix)SHLIB_SUFFIX) - -jni_shared_libraries := \ - $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \ - $(addsuffix $(so_suffix), \ - $(LOCAL_JNI_SHARED_LIBRARIES))) - -# Include RS dynamically-generated libraries as well -# Keep this ifneq, as the += otherwise adds spaces that need to be stripped. -ifneq ($(rs_compatibility_jni_libs),) -jni_shared_libraries += $(rs_compatibility_jni_libs) -endif - -# App explicitly requires the prebuilt NDK libstlport_shared.so. -# libstlport_shared.so should never go to the system image. -# Instead it should be packaged into the apk. -ifneq ($(filter $(LOCAL_NDK_STL_VARIANT), stlport_shared c++_shared),) -ifndef LOCAL_SDK_VERSION -$(error LOCAL_SDK_VERSION has to be defined together with LOCAL_NDK_STL_VARIANT, \ - LOCAL_PACKAGE_NAME=$(LOCAL_PACKAGE_NAME)) -endif -endif -ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT)) -jni_shared_libraries += \ - $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/stlport/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libstlport_shared.so -else -ifeq (c++_shared,$(LOCAL_NDK_STL_VARIANT)) -jni_shared_libraries += \ - $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/llvm-libc++/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libc++_shared.so -endif -endif - -# Set the abi directory used by the local JNI shared libraries. -# (Doesn't change how the local shared libraries are compiled, just -# sets where they are stored in the apk.) - -ifeq ($(LOCAL_JNI_SHARED_LIBRARIES_ABI),) - jni_shared_libraries_abi := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI) -else - jni_shared_libraries_abi := $(LOCAL_JNI_SHARED_LIBRARIES_ABI) -endif +include $(BUILD_SYSTEM)/install_jni_libs.mk # Pick a key to sign the package with. If this package hasn't specified # an explicit certificate, use the default. |