From e5696a5ccc736bc636f31deceee622cc21700a21 Mon Sep 17 00:00:00 2001
From: Prabir Pradhan <prabirmsp@google.com>
Date: Wed, 14 Nov 2018 19:55:21 -0800
Subject: InputFlinger Split: Use libinputreader in InputManagerService

This changes native InputManagerService to use the new backend library
for inputflinger: libinputreader.

Bug: 119264687
Test: manual: Build, run, and test input (touch, mouse)
Change-Id: I619492d5492cd8444d7c2cc7af9717c19c938256
---
 libs/input/Android.bp                                              | 5 ++++-
 libs/input/PointerController.h                                     | 2 +-
 services/core/jni/Android.bp                                       | 1 +
 services/core/jni/com_android_server_input_InputManagerService.cpp | 3 +--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index c5a6ec590d30..f1d9397783ed 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -28,10 +28,13 @@ cc_library_shared {
         "libgui",
         "libui",
         "libinput",
-        "libinputflinger",
         "libnativewindow",
     ],
 
+    header_libs: [
+        "libinputflinger_headers",
+    ],
+
     include_dirs: ["frameworks/native/services"],
 
     cflags: [
diff --git a/libs/input/PointerController.h b/libs/input/PointerController.h
index eb3469e0b3f0..7f4e5a59c9b6 100644
--- a/libs/input/PointerController.h
+++ b/libs/input/PointerController.h
@@ -24,7 +24,7 @@
 
 #include <ui/DisplayInfo.h>
 #include <input/Input.h>
-#include <inputflinger/PointerControllerInterface.h>
+#include <PointerControllerInterface.h>
 #include <utils/BitSet.h>
 #include <utils/RefBase.h>
 #include <utils/Looper.h>
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 04a526fe4cf2..bf83ac13fd93 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -83,6 +83,7 @@ cc_defaults {
         "libui",
         "libinput",
         "libinputflinger",
+        "libinputflinger_base",
         "libinputservice",
         "libschedulerservicehidl",
         "libsensorservice",
diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index 3943dba7092e..ba6f39f5a8a7 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -348,8 +348,7 @@ NativeInputManager::NativeInputManager(jobject contextObj,
     }
     mInteractive = true;
 
-    sp<EventHub> eventHub = new EventHub();
-    mInputManager = new InputManager(eventHub, this, this);
+    mInputManager = new InputManager(this, this);
 }
 
 NativeInputManager::~NativeInputManager() {
-- 
cgit v1.2.3-59-g8ed1b