commit 761299be6f3a76239cf7ee745ab781e621e5fe2c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 09 04:17:47 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 09 04:17:47 2023 +0000
tree ca30cd9e0e01a2608db7e5fffa24ead1526cedec
parent 8700dd629f0b09bdfb18d2953dfef0bc7478b302
parent 1e4a977d43251093f8fef35999a84342e650f89d

Snap for 11200327 from 1e4a977d43251093f8fef35999a84342e650f89d to 24Q1-release

Change-Id: I881dcde1ee98dbd6907567ac7989534e3b444576

Android.bp

diff --git a/Android.bp b/Android.bp
index 04b2a06..0cd395b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -243,13 +243,17 @@
 
     static_libs: ["libarect"],
 
-    // These runtime modules, including libcompiler_rt.so, are required for
-    // RenderScript.
+    // These runtime modules are required for RenderScript.
     required: [
         "libclcore.bc",
         "libclcore_debug.bc",
         "libclcore_debug_g.bc",
         "libclcore_g.bc",
+    ],
+
+    // Some runtime modules, such as libcompiler_rt, are also
+    // required from non-system variant.
+    runtime_libs: [
         "libcompiler_rt",
     ],