Snap for 8414339 from f693e4c775bffb872c961be2454bf46cbfd8fb3b to tm-qpr1-releaseandroid-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-release

Change-Id: I266f2a964836ec404e75059ed6dfd0f85d822270

1 files changed, 8 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 7c632cef..1b3a2e81 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,22 +122,21 @@ cc_library {
         "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: {