commit a11f6c2f0e8554587b2643fb79ea809bc6167850
author Miao Wang <miaowang@google.com> Wed Jul 29 11:46:23 2015 -0700
committer Miao Wang <miaowang@google.com> Wed Jul 29 11:46:23 2015 -0700
tree 3eade95069cfc7d878e97ab6d3fc011787d14a93
parent 302e944c6034060eb7ff51ea2a3abe740cf2c9b7

[RenderScript] Only upgrade RS target API for compat build.

  - Fix build

Bug: 22796994
Bug: 22693954
Change-Id: Iff91cc4691ea3e4cd8542cdf38245e2aa7724a71

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 040e674..bac5ca7 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -162,10 +162,12 @@
   endif  # LOCAL_SDK_VERSION is set
 endif  # LOCAL_RENDERSCRIPT_TARGET_API is set
 
-# For 64-bit, we always have to upgrade to at least 21
-ifeq ($(TARGET_IS_64_BIT),true)
-  ifneq ($(filter $(RSCOMPAT_32BIT_ONLY_API_LEVELS),$(renderscript_target_api)),)
-    renderscript_target_api := 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)
+    ifneq ($(filter $(RSCOMPAT_32BIT_ONLY_API_LEVELS),$(renderscript_target_api)),)
+      renderscript_target_api := 21
+    endif
   endif
 endif