Merge "Add build rules for 64bit Renderscript Compat lib."
This commit is contained in:
commit
caf44db2d1
2 changed files with 17 additions and 2 deletions
|
@ -596,4 +596,7 @@ RS_PREBUILT_CLCORE := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/librsrt_$(TA
|
||||||
RS_PREBUILT_LIBPATH := -L prebuilts/ndk/8/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib
|
RS_PREBUILT_LIBPATH := -L prebuilts/ndk/8/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib
|
||||||
RS_PREBUILT_COMPILER_RT := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libcompiler_rt.a
|
RS_PREBUILT_COMPILER_RT := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libcompiler_rt.a
|
||||||
|
|
||||||
|
# API Level lists for Renderscript Compat lib.
|
||||||
|
RSCOMPAT_32BIT_ONLY_API_LEVELS := 8 9 10 11 12 13 14 15 16 17 18 19 20
|
||||||
|
|
||||||
include $(BUILD_SYSTEM)/dumpvar.mk
|
include $(BUILD_SYSTEM)/dumpvar.mk
|
||||||
|
|
16
core/java.mk
16
core/java.mk
|
@ -202,8 +202,20 @@ $(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIP
|
||||||
|
|
||||||
ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),)
|
ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),)
|
||||||
bc_files := $(patsubst %.fs,%.bc, $(patsubst %.rs,%.bc, $(notdir $(renderscript_sources))))
|
bc_files := $(patsubst %.fs,%.bc, $(patsubst %.rs,%.bc, $(notdir $(renderscript_sources))))
|
||||||
|
|
||||||
|
|
||||||
|
ifeq ($(filter $(RSCOMPAT_32BIT_ONLY_API_LEVELS),$(renderscript_target_api)),)
|
||||||
|
ifeq ($(TARGET_IS_64_BIT),true)
|
||||||
|
renderscript_intermediate.bc_folder := $(renderscript_intermediate.COMMON)/res/raw/bc64/
|
||||||
|
else
|
||||||
|
renderscript_intermediate.bc_folder := $(renderscript_intermediate.COMMON)/res/raw/bc32/
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
renderscript_intermediate.bc_folder := $(renderscript_intermediate.COMMON)/res/raw/
|
||||||
|
endif
|
||||||
|
|
||||||
rs_generated_bc := $(addprefix \
|
rs_generated_bc := $(addprefix \
|
||||||
$(renderscript_intermediate.COMMON)/res/raw/, $(bc_files))
|
$(renderscript_intermediate.bc_folder), $(bc_files))
|
||||||
|
|
||||||
renderscript_intermediate := $(intermediates)/renderscript
|
renderscript_intermediate := $(intermediates)/renderscript
|
||||||
|
|
||||||
|
@ -228,7 +240,7 @@ $(rs_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \
|
||||||
$(rs_compatibility_jni_libs): $(BCC_COMPAT)
|
$(rs_compatibility_jni_libs): $(BCC_COMPAT)
|
||||||
$(rs_compatibility_jni_libs): PRIVATE_CXX := $(TARGET_CXX)
|
$(rs_compatibility_jni_libs): PRIVATE_CXX := $(TARGET_CXX)
|
||||||
$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \
|
$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \
|
||||||
$(renderscript_intermediate.COMMON)/res/raw/%.bc
|
$(renderscript_intermediate.bc_folder)%.bc
|
||||||
$(transform-bc-to-so)
|
$(transform-bc-to-so)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue