From bb5196e8575c529fc541344c894991e7edf5c82e Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Thu, 12 Feb 2015 16:22:59 -0800 Subject: [PATCH] [Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps. Bug: 19343399 Change-Id: I461e244be15e08d4525439bc042529314c84031e (cherry picked from commit c919b0ba88c0a7ce4b8722b4e3befbc81a652422) --- core/java.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java.mk b/core/java.mk index c47ea22019..cd90f03462 100644 --- a/core/java.mk +++ b/core/java.mk @@ -212,6 +212,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 \ @@ -221,8 +226,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