tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.

Browse source 
* commit '1f58c41742b6a063138226e6483010486f56657f':
  Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
This commit is contained in:
Ying Wang 2015-02-12 22:46:54 +00:00 committed by Android Git Automerger
commit a8b9a8c1ed
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/install_jni_libs_internal.mk
View file

@ -100,9 +100,15 @@ endif
my_prebuilt_jni_libs := $(addprefix $(LOCAL_PATH)/, \ my_prebuilt_jni_libs := $(addprefix $(LOCAL_PATH)/, \
$(filter-out @%, $(my_prebuilt_jni_libs))) $(filter-out @%, $(my_prebuilt_jni_libs)))
ifdef 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), \ $(foreach lib, $(my_prebuilt_jni_libs), \
$(eval $(call copy-one-file, $(lib), $(my_app_lib_path)/$(notdir $(lib))))) $(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))) $(LOCAL_INSTALLED_MODULE) : | $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs)))
endif # my_embed_jni
endif # inner my_prebuilt_jni_libs endif # inner my_prebuilt_jni_libs
endif # outer my_prebuilt_jni_libs endif # outer my_prebuilt_jni_libs