Merge "Handle libcompiler_rt as runtime_libs" into main am: 47f45d60a2 am: f1d3b81d88

Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/2864366

Change-Id: Ic8c56eb788dab85acf699f21747159e8797ff574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 04b2a06d..0cd395b5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -243,13 +243,17 @@ cc_library_shared {
 
     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",
     ],