diff options
| author | Miao Wang <miaowang@google.com> | 2015-01-07 18:18:41 -0800 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2015-01-08 17:19:42 -0800 |
| commit | e4359cf0f3cf417da1e833b7111b7e61bb41b5eb (patch) | |
| tree | abd47e32357653b5e3ff2814ae3aaa5f7cebe840 /core/java.mk | |
| parent | aa112716067167d58d1db37aaf8adc49b83b59a1 (diff) | |
| download | build-e4359cf0f3cf417da1e833b7111b7e61bb41b5eb.zip build-e4359cf0f3cf417da1e833b7111b7e61bb41b5eb.tar.gz build-e4359cf0f3cf417da1e833b7111b7e61bb41b5eb.tar.bz2 | |
Add build rules for 64bit Renderscript Compat lib.
Change-Id: Iea168f8ecb3b4cf6b9ab6ffefc403eb77ee09000
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 16 |
1 files changed, 14 insertions, 2 deletions
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 |