summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-11-01 19:53:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-11-01 19:53:51 +0000
commit6ff0aae7bc9d7051bc91057568bcf00ff6ee7bce (patch)
tree3da9e484cea3ed4d6758702a6149d619948c5be2
parentd5942efb6b9d718258e11d7ccea37e63a5e60f99 (diff)
parente3ad0f513aed278b4d82adaefe3c51cb73b8bc59 (diff)
downloadrs-6ff0aae7bc9d7051bc91057568bcf00ff6ee7bce.tar.gz
Merge "Disable VNDK and LLNDK renderscript libraries for riscv64" am: e3ad0f513a
Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/2280873 Change-Id: I847d9ba461e82539de90ce57b9dbbbd6300c2f2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp5
-rw-r--r--cpu_ref/Android.bp3
2 files changed, 8 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index a2eaf6f9..89ce35d1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,11 @@ cc_defaults {
"-Wno-unused-parameter",
"-Wno-unused-variable",
],
+ arch: {
+ riscv64: {
+ enabled: false,
+ },
+ },
}
cc_library_shared {
diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp
index 6b4d855a..32146e03 100644
--- a/cpu_ref/Android.bp
+++ b/cpu_ref/Android.bp
@@ -88,6 +88,9 @@ cc_library_shared {
cflags: ["-DARCH_X86_HAVE_AVX2", "-mavx2", "-mfma"],
},
},
+ riscv64: {
+ enabled: false,
+ },
},
shared_libs: [