diff options
| author | Miao Wang <miaowang@google.com> | 2015-01-09 17:48:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-09 17:48:22 +0000 |
| commit | de00ebbe24185237a1056fde39cfc839534e31da (patch) | |
| tree | 12b90beddf6bd97d114794cd233ba365d79d0000 /core/java.mk | |
| parent | ee65f03b3c35e481d1bd1a6f4e8374953d20fe98 (diff) | |
| parent | caf44db2d1d829a001d5b0ac8371d33928b3d575 (diff) | |
| download | build-de00ebbe24185237a1056fde39cfc839534e31da.zip build-de00ebbe24185237a1056fde39cfc839534e31da.tar.gz build-de00ebbe24185237a1056fde39cfc839534e31da.tar.bz2 | |
am caf44db2: Merge "Add build rules for 64bit Renderscript Compat lib."
* commit 'caf44db2d1d829a001d5b0ac8371d33928b3d575':
Add build rules for 64bit Renderscript Compat lib.
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 bb634ac..687546f 100644 --- a/core/java.mk +++ b/core/java.mk @@ -205,8 +205,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 @@ -231,7 +243,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 |