Merge "Handle libcompiler_rt as runtime_libs" into main am: 47f45d60a2 am: f1d3b81d88 am: b77b032d28
Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/2864366
Change-Id: I837061db3a97223f76f424e4d7572f34534fb0ac
Signed-off-by: Automerger Merge Worker <[email protected]>
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",
],
