StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java.mk
View File

@@ -162,10 +162,12 @@ 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),)
ifneq ($(filter $(RSCOMPAT_32BIT_ONLY_API_LEVELS),$(renderscript_target_api)),) ifeq ($(TARGET_IS_64_BIT),true)
renderscript_target_api := 21 ifneq ($(filter $(RSCOMPAT_32BIT_ONLY_API_LEVELS),$(renderscript_target_api)),)
renderscript_target_api := 21
endif
endif endif
endif endif