commit 433cfd90caaeb5f50b0bf7276245f3a43b1eb4f2
author Colin Cross <ccross@android.com> Fri Jul 16 22:29:59 2021 -0700
committer Colin Cross <ccross@android.com> Tue Jul 20 17:22:39 2021 +0000
tree 179bddbd81ee2ddf93aee88631e952418d8ab9c8
parent 90bf7b7a152e9d5142a4113de9bcf0270546e9bb

Attempt to fix mac build

libgui_window_info_static is not available in mac builds because it
depends on libbinder.  Only link against it in linux and device
builds.

Bug: 192864819
Test: m libinput
Change-Id: I1a7378ef90b7c71ba6da0ce439c41192bfe4bca6
Merged-In: I1a7378ef90b7c71ba6da0ce439c41192bfe4bca6
(cherry picked from commit d426d2e4fc676f77942531884910f764d5741f94)

libs/input/Android.bp

diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index 1a142c9..02cf9eb 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -68,12 +68,10 @@
 
     static_libs: [
         "libui-types",
-        "libgui_window_info_static",
     ],
 
     export_static_lib_headers: [
         "libui-types",
-        "libgui_window_info_static",
     ],
 
     target: {
@@ -96,6 +94,14 @@
                 "libui",
             ],
 
+            static_libs: [
+                "libgui_window_info_static",
+            ],
+
+            export_static_lib_headers: [
+                "libgui_window_info_static",
+            ],
+
             sanitize: {
                 misc_undefined: ["integer"],
             },
@@ -117,10 +123,15 @@
             ],
             static_libs: [
                 "libhostgraphics",
+                "libgui_window_info_static",
             ],
             shared_libs: [
                 "libbinder",
             ],
+
+            export_static_lib_headers: [
+                "libgui_window_info_static",
+            ],
         },
     },