commit 9c50f3b8a781c68ebd7591fb8d860689b6e24667
author Jerome Gaillard <jgaillard@google.com> Thu Sep 19 17:25:45 2024 +0100
committer Jerome Gaillard <jgaillard@google.com> Thu Sep 19 18:32:28 2024 +0100
tree bd9f237fa217fb70887e0bdfb83f267c5ae7b8c4
parent e18c738bed5d68a1157a3e8b22fb6c7b81b57071

Graphics interface libraries only exist for linux/Android

cc_defaults in graphics/Android.bp should only add libraries to linux
(which includes Android) targets, as those libraries do not exist on
other platforms (macOS/Windows).
This avoids issues when these defaults are added to libraries that build
for host as well as Android (such as libhwui).

Bug: 368328962
Test: N/A
Change-Id: If19aa1f6b66721b86678a036b7f1f185cb90635b

graphics/Android.bp

diff --git a/graphics/Android.bp b/graphics/Android.bp
index c33f7ff..9e604a1 100644
--- a/graphics/Android.bp
+++ b/graphics/Android.bp
@@ -18,9 +18,13 @@
 
 cc_defaults {
     name: "android.hardware.graphics.allocator-ndk_static",
-    static_libs: [
-        "android.hardware.graphics.allocator-V2-ndk",
-    ],
+    target: {
+        linux: {
+            static_libs: [
+                "android.hardware.graphics.allocator-V2-ndk",
+            ],
+        },
+    },
     defaults: [
         "android.hardware.graphics.common-ndk_static",
     ],
@@ -28,9 +32,13 @@
 
 cc_defaults {
     name: "android.hardware.graphics.allocator-ndk_shared",
-    shared_libs: [
-        "android.hardware.graphics.allocator-V2-ndk",
-    ],
+    target: {
+        linux: {
+            shared_libs: [
+                "android.hardware.graphics.allocator-V2-ndk",
+            ],
+        },
+    },
     defaults: [
         "android.hardware.graphics.common-ndk_shared",
     ],
@@ -38,30 +46,46 @@
 
 cc_defaults {
     name: "android.hardware.graphics.common-ndk_static",
-    static_libs: [
-        "android.hardware.graphics.common-V5-ndk",
-    ],
+    target: {
+        linux: {
+            static_libs: [
+                "android.hardware.graphics.common-V5-ndk",
+            ],
+        },
+    },
 }
 
 cc_defaults {
     name: "android.hardware.graphics.common-ndk_shared",
-    shared_libs: [
-        "android.hardware.graphics.common-V5-ndk",
-    ],
+    target: {
+        linux: {
+            shared_libs: [
+                "android.hardware.graphics.common-V5-ndk",
+            ],
+        },
+    },
 }
 
 cc_defaults {
     name: "android.hardware.graphics.composer3-ndk_static",
-    static_libs: [
-        "android.hardware.drm.common-V1-ndk",
-        "android.hardware.graphics.composer3-V4-ndk",
-    ],
+    target: {
+        linux: {
+            static_libs: [
+                "android.hardware.drm.common-V1-ndk",
+                "android.hardware.graphics.composer3-V4-ndk",
+            ],
+        },
+    },
 }
 
 cc_defaults {
     name: "android.hardware.graphics.composer3-ndk_shared",
-    shared_libs: [
-        "android.hardware.drm.common-V1-ndk",
-        "android.hardware.graphics.composer3-V4-ndk",
-    ],
+    target: {
+        linux: {
+            shared_libs: [
+                "android.hardware.drm.common-V1-ndk",
+                "android.hardware.graphics.composer3-V4-ndk",
+            ],
+        },
+    },
 }