commit 90f27d4314335a6d0f45f3ee29cec34b45d28876
author Colin Cross <ccross@android.com> Tue Jul 20 18:51:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 20 18:51:50 2021 +0000
tree 1260a7be1487a1da4d18d0c5b6f0dc96255b7419
parent 8d71f10b0985a9322e365e007f3830c930636c43
parent 6ef88d4fd2634c2b4670642f2a78cd32e2cabd0d

Merge "Attempt to fix mac build" into sc-v2-dev am: 6ef88d4fd2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15339511

Change-Id: I9a1443487befdaf4e99331c7efb917327652aa8d

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",
+            ],
         },
     },