openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev 

* commit 'fbf80e9d6294c9ab1989572faab888e4f8641b1c':
  [RenderScript] Only upgrade RS target API for compat build.
This commit is contained in:
Miao Wang 2015-07-29 19:23:45 +00:00 committed by Android Git Automerger
parent 9e8d227861 fbf80e9d62
commit b7a3bc569c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/java.mk
View File

@ -162,12 +162,14 @@ else
endif # LOCAL_SDK_VERSION is set endif # LOCAL_SDK_VERSION is set
endif # LOCAL_RENDERSCRIPT_TARGET_API is set endif # LOCAL_RENDERSCRIPT_TARGET_API is set
# For 64-bit, we always have to upgrade to at least 21 # For 64-bit, we always have to upgrade to at least 21 for compat build.
ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),)
ifeq ($(TARGET_IS_64_BIT),true) ifeq ($(TARGET_IS_64_BIT),true)
ifneq ($(filter $(RSCOMPAT_32BIT_ONLY_API_LEVELS),$(renderscript_target_api)),) ifneq ($(filter $(RSCOMPAT_32BIT_ONLY_API_LEVELS),$(renderscript_target_api)),)
renderscript_target_api := 21 renderscript_target_api := 21
endif endif
endif endif
endif
ifeq ($(LOCAL_RENDERSCRIPT_CC),) ifeq ($(LOCAL_RENDERSCRIPT_CC),)
LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC) LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC)