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

* commit 'a8b9a8c1ed5e7d7e0cdc39c2c10f964b95a98e7a':
  Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
This commit is contained in:
Ying Wang
2015-02-12 22:58:44 +00:00
committed by Android Git Automerger

View File

@@ -100,9 +100,15 @@ endif
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