commit f693e4c775bffb872c961be2454bf46cbfd8fb3b
author Colin Cross <ccross@android.com> Mon Mar 14 22:10:56 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 14 22:10:56 2022 +0000
tree 053d3acaad91c69e7ad71b460a591612de7d19c3
parent 4bc9d0d28154610618b643317e871ae5f6332450
parent 1763bf7fde2393d9dbb932e69e0c75f8d9b7fc5b

Tweak linux_glibc properties for musl builds in external/virglrenderer am: cf1de0f462 am: f6c12bd7e3 am: 1763bf7fde

Original change: https://android-review.googlesource.com/c/platform/external/virglrenderer/+/2019635

Change-Id: I45b3c3b5a26cf46fadc94a17ec64c524ec6e9780

Android.bp

diff --git a/Android.bp b/Android.bp
index 7c632ce..1b3a2e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,22 +122,21 @@
         "src/vrend_winsys_gbm.c",
     ],
     target: {
+        host_linux: {
+            shared_libs: [
+                "libdrm",
+                "libepoxy",
+                "libgbm",
+            ],
+        },
         linux_glibc: {
             // Avoid linking to another host copy of libdrm; this library will cause
             // binary GPU drivers to be loaded from the host, which might be linked
             // to a system copy of libdrm, which conflicts with the AOSP one
             allow_undefined_symbols: true,
             header_libs: ["libdrm_headers"],
-            shared_libs: [
-                "libepoxy",
-                "libgbm"
-            ],
-        },
-        linux_bionic: {
-            shared_libs: [
+            exclude_shared_libs: [
                 "libdrm",
-                "libepoxy",
-                "libgbm",
             ],
         },
         android: {