commit 95627f6e5434a8da33a99be72ae654e22a3b89f0
author Ying Wang <wangying@google.com> Thu Feb 12 22:58:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 12 22:58:44 2015 +0000
tree d22e7288b3a4b1d5c75ed6b7029919b972d3db33
parent b5a3e2fe9d85523f9e0ea3a0311ce7607b97a194
parent a8b9a8c1ed5e7d7e0cdc39c2c10f964b95a98e7a

am a8b9a8c1: am 1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.

* commit 'a8b9a8c1ed5e7d7e0cdc39c2c10f964b95a98e7a':
  Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.

core/install_jni_libs_internal.mk

diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk
index 944420b..c28bb15 100644
--- a/core/install_jni_libs_internal.mk
+++ b/core/install_jni_libs_internal.mk
@@ -100,9 +100,15 @@
 my_prebuilt_jni_libs := $(addprefix $(LOCAL_PATH)/, \
     $(filter-out @%, $(my_prebuilt_jni_libs)))
 ifdef my_prebuilt_jni_libs
+ifdef my_embed_jni
+# Embed my_prebuilt_jni_libs to the apk
+my_jni_shared_libraries += $(my_prebuilt_jni_libs)
+else # not my_embed_jni
+# Install my_prebuilt_jni_libs as separate files.
 $(foreach lib, $(my_prebuilt_jni_libs), \
     $(eval $(call copy-one-file, $(lib), $(my_app_lib_path)/$(notdir $(lib)))))
 
 $(LOCAL_INSTALLED_MODULE) : | $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs)))
+endif  # my_embed_jni
 endif  # inner my_prebuilt_jni_libs
 endif  # outer my_prebuilt_jni_libs