diff options
| author | Miao Wang <miaowang@google.com> | 2015-01-09 17:38:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-09 17:38:47 +0000 |
| commit | caf44db2d1d829a001d5b0ac8371d33928b3d575 (patch) | |
| tree | 485e2a82a4826c2eacb1d699a5bcf4fc365b454c | |
| parent | dd198b77a1bae9974b741cc7d1dad328dce3c3b6 (diff) | |
| parent | e4359cf0f3cf417da1e833b7111b7e61bb41b5eb (diff) | |
| download | build-caf44db2d1d829a001d5b0ac8371d33928b3d575.zip build-caf44db2d1d829a001d5b0ac8371d33928b3d575.tar.gz build-caf44db2d1d829a001d5b0ac8371d33928b3d575.tar.bz2 | |
Merge "Add build rules for 64bit Renderscript Compat lib."
| -rw-r--r-- | core/config.mk | 3 | ||||
| -rw-r--r-- | core/java.mk | 16 |
2 files changed, 17 insertions, 2 deletions
diff --git a/core/config.mk b/core/config.mk index f51a29a..33ce619 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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_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 diff --git a/core/java.mk b/core/java.mk index 98d5138..13cf39d 100644 --- a/core/java.mk +++ b/core/java.mk @@ -202,8 +202,20 @@ $(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIP ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),) 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 \ - $(renderscript_intermediate.COMMON)/res/raw/, $(bc_files)) + $(renderscript_intermediate.bc_folder), $(bc_files)) 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): PRIVATE_CXX := $(TARGET_CXX) $(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \ - $(renderscript_intermediate.COMMON)/res/raw/%.bc + $(renderscript_intermediate.bc_folder)%.bc $(transform-bc-to-so) endif |