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

am 105b94cc: Merge "[Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps."

Browse source 
* commit '105b94cc44dc3cec6df22ac6e80da8dcb3ffd031':
  [Renderscript] making librsjni.so be packed with apks when v8.renderscript is needed, even for bundled apps.
This commit is contained in:
Dan Albert 2015-03-13 17:42:52 +00:00 committed by Android Git Automerger
commit b3ca410ead
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/java.mk
View file

@ -212,6 +212,11 @@ renderscript_intermediate := $(intermediates)/renderscript
# We don't need the .so files in bundled branches # We don't need the .so files in bundled branches
# Prevent these from showing up on the device # 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)) ifneq (,$(TARGET_BUILD_APPS)$(FORCE_BUILD_RS_COMPAT))
rs_compatibility_jni_libs := $(addprefix \ rs_compatibility_jni_libs := $(addprefix \
@ -221,8 +226,7 @@ rs_compatibility_jni_libs := $(addprefix \
$(rs_generated_bc) : $(RenderScript_file_stamp) $(rs_generated_bc) : $(RenderScript_file_stamp)
rs_support_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupport.so rs_support_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupport.so
rs_jni_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/librsjni.so LOCAL_JNI_SHARED_LIBRARIES += libRSSupport
LOCAL_JNI_SHARED_LIBRARIES += libRSSupport librsjni
rs_support_io_lib := rs_support_io_lib :=
# check if the target api level support USAGE_IO # check if the target api level support USAGE_IO