Remove libui dependencies from input code
We would like to eventually compile some or all of the input code
for host. Currently, libui-types is a small library that provides types
like Transform, Region, Rect. That build target is host-supported.
Switch input dependencies to use libui-types only.
Bug: 249591924
Test: m checkinput
Change-Id: I406a4c3b5ffe190271486213240d67a2e7d4bd25
diff --git a/services/inputflinger/Android.bp b/services/inputflinger/Android.bp
index 88a9acb..378900a 100644
--- a/services/inputflinger/Android.bp
+++ b/services/inputflinger/Android.bp
@@ -85,12 +85,12 @@
"libstatspull",
"libstatssocket",
"libutils",
- "libui",
"server_configurable_flags",
],
static_libs: [
"libattestation",
"libpalmrejection",
+ "libui-types",
],
}
@@ -152,7 +152,6 @@
"libcutils",
"libinput",
"liblog",
- "libui",
"libutils",
],
header_libs: [
diff --git a/services/inputflinger/benchmarks/Android.bp b/services/inputflinger/benchmarks/Android.bp
index 75071d5..e5c19af 100644
--- a/services/inputflinger/benchmarks/Android.bp
+++ b/services/inputflinger/benchmarks/Android.bp
@@ -26,7 +26,6 @@
"libinputreporter",
"liblog",
"libstatslog",
- "libui",
"libutils",
],
static_libs: [
diff --git a/services/inputflinger/dispatcher/Android.bp b/services/inputflinger/dispatcher/Android.bp
index cdad9c9..eb79b76 100644
--- a/services/inputflinger/dispatcher/Android.bp
+++ b/services/inputflinger/dispatcher/Android.bp
@@ -63,7 +63,6 @@
"libstatslog",
"libstatspull",
"libstatssocket",
- "libui",
"libgui",
"libutils",
"server_configurable_flags",
diff --git a/services/inputflinger/dispatcher/InputDispatcher.h b/services/inputflinger/dispatcher/InputDispatcher.h
index b5bbce8..0cf2a1a 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.h
+++ b/services/inputflinger/dispatcher/InputDispatcher.h
@@ -41,7 +41,6 @@
#include <input/InputTransport.h>
#include <limits.h>
#include <stddef.h>
-#include <ui/Region.h>
#include <unistd.h>
#include <utils/BitSet.h>
#include <utils/Looper.h>
diff --git a/services/inputflinger/reader/Android.bp b/services/inputflinger/reader/Android.bp
index 01146a3..0f87201 100644
--- a/services/inputflinger/reader/Android.bp
+++ b/services/inputflinger/reader/Android.bp
@@ -69,12 +69,12 @@
"libinput",
"liblog",
"libstatslog",
- "libui",
"libutils",
"libPlatformProperties",
],
static_libs: [
"libc++fs",
+ "libui-types",
],
header_libs: [
"libbatteryservice_headers",
diff --git a/services/inputflinger/tests/InputFlingerService_test.cpp b/services/inputflinger/tests/InputFlingerService_test.cpp
index 22ae894..ca548be 100644
--- a/services/inputflinger/tests/InputFlingerService_test.cpp
+++ b/services/inputflinger/tests/InputFlingerService_test.cpp
@@ -33,8 +33,6 @@
#include <inttypes.h>
#include <linux/uinput.h>
#include <log/log.h>
-#include <ui/Rect.h>
-#include <ui/Region.h>
#include <chrono>
#include <thread>
#include <unordered_map>
diff --git a/services/inputflinger/tests/fuzzers/Android.bp b/services/inputflinger/tests/fuzzers/Android.bp
index f4ecba2..55c2db6 100644
--- a/services/inputflinger/tests/fuzzers/Android.bp
+++ b/services/inputflinger/tests/fuzzers/Android.bp
@@ -21,7 +21,6 @@
default_applicable_licenses: ["frameworks_native_license"],
}
-
cc_fuzz {
name: "inputflinger_latencytracker_fuzzer",
defaults: [
@@ -34,7 +33,6 @@
"libbase",
"libbinder",
"liblog",
- "libui",
"libutils",
"libinput",
"libinputflinger",
@@ -43,7 +41,7 @@
"LatencyTrackerFuzzer.cpp",
],
fuzz_config: {
- cc: ["android-framework-input@google.com"],
+ cc: ["android-framework-input@google.com"],
},
}
@@ -63,7 +61,6 @@
"libcutils",
"liblog",
"libutils",
- "libui",
"libinput",
"libinputflinger",
"libinputreader",
@@ -75,7 +72,7 @@
"libinputreader_headers",
],
fuzz_config: {
- cc: ["android-framework-input@google.com"],
+ cc: ["android-framework-input@google.com"],
},
}