From e66d7c1de0a888785cdbf697bebe53be7ed83380 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 12 Feb 2015 11:29:41 -0800 Subject: [PATCH] Support LOCAL_PREBUILT_JNI_LIBS in unbundled build. Package up LOCAL_PREBUILT_JNI_LIBS when you do tapas (apps_only) build. Change-Id: Ibdc920fee22d4940eebee080a940e8e9492c06cb --- core/install_jni_libs_internal.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk index 944420b83..c28bb15d3 100644 --- a/core/install_jni_libs_internal.mk +++ b/core/install_jni_libs_internal.mk @@ -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