diff options
| author | Ying Wang <wangying@google.com> | 2015-05-04 18:39:46 +0000 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-05-04 18:39:46 +0000 |
| commit | 97dfa3177d9594f9691424052b2a85befeb0b3d8 (patch) | |
| tree | 9b0a13a8af49246afaab9a307bfa307b883a7d9e /core/install_jni_libs.mk | |
| parent | 3797466fbd31cc3ca5a1eddea64e7fdf0921ea67 (diff) | |
| download | build-97dfa3177d9594f9691424052b2a85befeb0b3d8.zip build-97dfa3177d9594f9691424052b2a85befeb0b3d8.tar.gz build-97dfa3177d9594f9691424052b2a85befeb0b3d8.tar.bz2 | |
Revert "Don't extract jni from prebuilt apks."
This reverts commit 3797466fbd31cc3ca5a1eddea64e7fdf0921ea67.
Bug: 20810492
Bug: 20811499
Change-Id: Ic922d9daccc4550db489c0f3d4ad6b4ff85b5e60
Diffstat (limited to 'core/install_jni_libs.mk')
| -rw-r--r-- | core/install_jni_libs.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/install_jni_libs.mk b/core/install_jni_libs.mk index 625a8a2..da3032d 100644 --- a/core/install_jni_libs.mk +++ b/core/install_jni_libs.mk @@ -8,7 +8,7 @@ # # Output variables: # jni_shared_libraries, jni_shared_libraries_abi, jni_shared_libraries_with_abis if we are going to embed the libraries into the apk; -# embedded_prebuilt_jni_libs, prebuilt jni libs embedded in prebuilt apk. +# extracted_jni_libs, if we extract jni libs from prebuilt apk. # my_embed_jni := @@ -27,7 +27,7 @@ jni_shared_libraries := jni_shared_libraries_abis := # jni_shared_libraries_with_abis is a list of <abi>:<path-to-the-built-jni-lib> jni_shared_libraries_with_abis := -embedded_prebuilt_jni_libs := +extracted_jni_libs := ####################################### # For TARGET_ARCH @@ -51,7 +51,7 @@ jni_shared_libraries += $(my_jni_shared_libraries) jni_shared_libraries_abis += $(my_jni_shared_libraries_abi) jni_shared_libraries_with_abis += $(addprefix $(my_jni_shared_libraries_abi):,\ $(my_jni_shared_libraries)) -embedded_prebuilt_jni_libs += $(my_embedded_prebuilt_jni_libs) +extracted_jni_libs += $(my_extracted_jni_libs) # Include RS dynamically-generated libraries as well # TODO: Add multilib support once RS supports generating multilib libraries. @@ -83,11 +83,11 @@ jni_shared_libraries += $(my_jni_shared_libraries) jni_shared_libraries_abis += $(my_jni_shared_libraries_abi) jni_shared_libraries_with_abis += $(addprefix $(my_jni_shared_libraries_abi):,\ $(my_jni_shared_libraries)) -embedded_prebuilt_jni_libs += $(my_embedded_prebuilt_jni_libs) +extracted_jni_libs += $(my_extracted_jni_libs) endif # my_add_jni endif # TARGET_2ND_ARCH jni_shared_libraries := $(strip $(jni_shared_libraries)) jni_shared_libraries_abis := $(sort $(jni_shared_libraries_abis)) jni_shared_libraries_with_abis := $(strip $(jni_shared_libraries_with_abis)) -embedded_prebuilt_jni_libs := $(strip $(embedded_prebuilt_jni_libs)) +extracted_jni_libs := $(strip $(extracted_jni_libs)) |