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

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

* commit '88618b8ee98f6861cc4533a8c8e1b52c4017d52b':
  [RenderScript] Only upgrade RS target API for compat build.
This commit is contained in:
Miao Wang 2015-07-29 20:09:50 +00:00 committed by Android Git Automerger
parent d1597242c8 88618b8ee9
commit fbfa983a59
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/java.mk
View File

@ -162,11 +162,13 @@ 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.
ifeq ($(TARGET_IS_64_BIT),true) ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),)
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),)