diff options
| author | Ying Wang <wangying@google.com> | 2015-02-12 11:29:41 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-02-12 11:29:41 -0800 |
| commit | e66d7c1de0a888785cdbf697bebe53be7ed83380 (patch) | |
| tree | 26c15c37f9ac9293331889f84650ed16bcf3e6fe /core/install_jni_libs_internal.mk | |
| parent | 69d82790487c0faeb92815e41fd39cea560c981d (diff) | |
| download | build-e66d7c1de0a888785cdbf697bebe53be7ed83380.zip build-e66d7c1de0a888785cdbf697bebe53be7ed83380.tar.gz build-e66d7c1de0a888785cdbf697bebe53be7ed83380.tar.bz2 | |
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
Package up LOCAL_PREBUILT_JNI_LIBS when you do tapas (apps_only) build.
Change-Id: Ibdc920fee22d4940eebee080a940e8e9492c06cb
Diffstat (limited to 'core/install_jni_libs_internal.mk')
| -rw-r--r-- | core/install_jni_libs_internal.mk | 6 |
1 files changed, 6 insertions, 0 deletions
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 @@ 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 |