diff options
| author | Miao Wang <miaowang@google.com> | 2015-07-25 17:34:21 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2015-07-27 13:15:27 -0700 |
| commit | 4581f03df1786d3a2585dabb599278b9c0257df9 (patch) | |
| tree | 3eb4c5194a9d67cf73430fe74e430c985e515c60 | |
| parent | 6d4dabc61625fb271c5e3e10f0689b2996de3933 (diff) | |
| download | rs-4581f03df1786d3a2585dabb599278b9c0257df9.tar.gz | |
Disable jack usage for when building RS prebuilts
Bug: 22693954
Change-Id: Ibfc46acf2a23e711b9f4c8236bff4d7c9f8acb43
| -rw-r--r-- | java/tests/RSTest_CompatLib/Android.mk | 5 | ||||
| -rwxr-xr-x | update_rs_prebuilts.sh | 4 |
2 files changed, 9 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) diff --git a/update_rs_prebuilts.sh b/update_rs_prebuilts.sh index 3a5115ee..397d9190 100755 --- a/update_rs_prebuilts.sh +++ b/update_rs_prebuilts.sh @@ -39,6 +39,10 @@ export FORCE_BUILD_LLVM_COMPONENTS=true # actual required compiler pieces. export FORCE_BUILD_RS_COMPAT=true +# Disable JACK when buiding RS prebuilts. Without this variable, we won't be +# able to get classes.jar. +export UPDATE_RS_PREBUILTS_DISABLE_JACK=true + # ANDROID_HOST_OUT is where the new prebuilts will be constructed/copied from. ANDROID_HOST_OUT=$MY_ANDROID_DIR/out/host/$SHORT_OSNAME-x86/ |