Remove build dependency of surfaceflinger on libinput
frameworks/native/libs/input:
- Extract commonly used input aidl files to a static library
`iinputflinger_aidl_lib_static`.
- Update `libinput` to use this library instead of aidl sources.
frameworks/native/services/surfaceflinger:
- Replace surfaceflinger dependency on `libinput` with
`iinputflinger_aidl_lib_static`.
vendor/google_arc/libs/libsurfaceflinger_arc:
- We have to add back the dependency on `libinput` here, since
surfaceflinger_arc depends on `libinput_serialtracker`, which
uses libinput definitions.
Note: We may want to try to remove the surfaceflinger_arc
dependency on libinput in a follow-up change.
Test: m checkinput
Test: m surfaceflinger && m libsurfaceflinger_arc_test && m surfaceflinger_service_fuzzer
Test: Flash to device (tangorpro) and device boots normally.
Test: Input functions normally (manual test of stylus prediction shows MotionPredictor working and prediction metrics to be reasonable).
Bug: 325334079
Change-Id: Id549d0f6c4f3cd85d4cba5d6f8f969327f7b6de1
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index d771803..0638e02 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -83,11 +83,11 @@
"libprotobuf-cpp-lite",
"libsync",
"libui",
- "libinput",
"libutils",
"libSurfaceFlingerProp",
],
static_libs: [
+ "iinputflinger_aidl_lib_static",
"libaidlcommonsupport",
"libcompositionengine",
"libframetimeline",