summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-07-25 17:34:21 -0700
committerStephen Hines <srhines@google.com>2015-07-27 13:15:27 -0700
commit4581f03df1786d3a2585dabb599278b9c0257df9 (patch)
tree3eb4c5194a9d67cf73430fe74e430c985e515c60 /java
parent6d4dabc61625fb271c5e3e10f0689b2996de3933 (diff)
downloadrs-4581f03df1786d3a2585dabb599278b9c0257df9.tar.gz
Disable jack usage for when building RS prebuilts
Bug: 22693954 Change-Id: Ibfc46acf2a23e711b9f4c8236bff4d7c9f8acb43
Diffstat (limited to 'java')
-rw-r--r--java/tests/RSTest_CompatLib/Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/tests/RSTest_CompatLib/Android.mk b/java/tests/RSTest_CompatLib/Android.mk
index 8ef89105..a50fb11e 100644
--- a/java/tests/RSTest_CompatLib/Android.mk
+++ b/java/tests/RSTest_CompatLib/Android.mk
@@ -37,4 +37,9 @@ LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := \
LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
LOCAL_JNI_SHARED_LIBRARIES := librsjni
+# Disable JACK when RSTest_Compatlib is used for updating RS prebuilts.
+ifneq (,$(UPDATE_RS_PREBUILTS_DISABLE_JACK))
+LOCAL_JACK_ENABLED := disabled
+endif
+
include $(BUILD_PACKAGE)