Handle libcompiler_rt as runtime_libs
libcompiler_rt is described as 'required' of libRS_internal, but this
fails to copy vendor variant of libcompiler_rt with dependency because
'required' only works on system variant. This change moves
libcompiler_rt as 'runtime_libs' of libRS_internal, so it would work
with vendor variant also.
Bug: 314835166
Test: libcompiler_rt.so presents in /vendor/lib64 of mokey build
Change-Id: I917e2b67265cec3ab19dcbabadd0994074ab59f4
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",
],
