commit 48a02431cfd3d7f20b1944127f67de33b1daceb1
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 21 18:46:10 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 21 18:46:10 2022 +0000
tree af354dd82e6d8e762ead2dee99fa95d2f3dfe6f2
parent d4ebf5423ae43a7b30ae60359acf028a93cc1eac
parent 45b703e8d8d2003423e03984be73248588020d78

Merge "Do not link tests to libinputreader"

services/inputflinger/Android.bp

diff --git a/services/inputflinger/Android.bp b/services/inputflinger/Android.bp
index d1de551..b885435 100644
--- a/services/inputflinger/Android.bp
+++ b/services/inputflinger/Android.bp
@@ -60,7 +60,6 @@
     name: "libinputflinger_sources",
     srcs: [
         "InputCommonConverter.cpp",
-        "InputManager.cpp",
         "InputProcessor.cpp",
         "PreferStylusOverTouchBlocker.cpp",
         "UnwantedInteractionBlocker.cpp",
@@ -116,6 +115,10 @@
         "inputflinger_defaults",
         "libinputflinger_defaults",
     ],
+    srcs: [
+        "InputManager.cpp",
+        // other sources are added via "defaults"
+    ],
     cflags: [
         // TODO(b/23084678): Move inputflinger to its own process and mark it hidden
         //-fvisibility=hidden

services/inputflinger/tests/Android.bp

diff --git a/services/inputflinger/tests/Android.bp b/services/inputflinger/tests/Android.bp
index b6d0709..e55e121 100644
--- a/services/inputflinger/tests/Android.bp
+++ b/services/inputflinger/tests/Android.bp
@@ -81,9 +81,6 @@
         "libc++fs",
         "libgmock",
     ],
-    shared_libs: [
-        "libinputreader",
-    ],
     require_root: true,
     test_options: {
         unit_test: true,