diff options
| author | Miao Wang <miaowang@google.com> | 2015-02-13 17:56:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-13 17:56:52 +0000 |
| commit | 8b24d3bceddff32d7250c9174247baef2d9ee22b (patch) | |
| tree | 8f90aba0e975db38321c1a4f6a382158befc1b1e /core/java.mk | |
| parent | 4d88a3639b6a76763de3be6dcc18582bdb873188 (diff) | |
| parent | c919b0ba88c0a7ce4b8722b4e3befbc81a652422 (diff) | |
| download | build-8b24d3bceddff32d7250c9174247baef2d9ee22b.zip build-8b24d3bceddff32d7250c9174247baef2d9ee22b.tar.gz build-8b24d3bceddff32d7250c9174247baef2d9ee22b.tar.bz2 | |
Merge "[Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps."
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java.mk b/core/java.mk index 4725fd4..f5b5c45 100644 --- a/core/java.mk +++ b/core/java.mk @@ -220,6 +220,11 @@ renderscript_intermediate := $(intermediates)/renderscript # We don't need the .so files in bundled branches # Prevent these from showing up on the device +# One exception is librsjni.so, which is needed for +# both native path and compat path. +rs_jni_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/librsjni.so +LOCAL_JNI_SHARED_LIBRARIES += librsjni + ifneq (,$(TARGET_BUILD_APPS)$(FORCE_BUILD_RS_COMPAT)) rs_compatibility_jni_libs := $(addprefix \ @@ -229,8 +234,7 @@ rs_compatibility_jni_libs := $(addprefix \ $(rs_generated_bc) : $(RenderScript_file_stamp) rs_support_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupport.so -rs_jni_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/librsjni.so -LOCAL_JNI_SHARED_LIBRARIES += libRSSupport librsjni +LOCAL_JNI_SHARED_LIBRARIES += libRSSupport rs_support_io_lib := # check if the target api level support USAGE_IO |