commit 2770d2473085bc0878e56cad5f5a4c75591d2118
author Prabir Pradhan <prabirmsp@google.com> Mon Sep 02 18:07:11 2019 -0700
committer Prabir Pradhan <prabirmsp@google.com> Thu Sep 19 17:02:47 2019 -0700
tree 8789a7c7d450664bffef2086fb20c057c4c14a8a
parent baa5c82401ca50ef496818b5949ca06812f5f8ef

Create inputmappers and accumulators directories

Inside the 'inputreader' directory, we create an 'mapper' directory
to hold the InputMappers and a 'mapper/accumulator' directory to
hold the Accumulators.

Bug: 140139676
Test: atest inputflinger_tests
Test: Touch, keyboard, trackpad, and mouse works on crosshatch
Change-Id: I4966919cd5b42353dd8c1e7cc7663f6c83765542

services/inputflinger/reader/Android.bp

diff --git a/services/inputflinger/reader/Android.bp b/services/inputflinger/reader/Android.bp
index 7b30765..a64f4dd 100644
--- a/services/inputflinger/reader/Android.bp
+++ b/services/inputflinger/reader/Android.bp
@@ -14,7 +14,11 @@
 
 cc_library_headers {
     name: "libinputreader_headers",
-    export_include_dirs: ["include"],
+    export_include_dirs: [
+        "include",
+        "mapper",
+        "mapper/accumulator",
+    ],
 }
 
 cc_library_shared {
@@ -22,26 +26,26 @@
     defaults: ["inputflinger_defaults"],
 
     srcs: [
-        "CursorButtonAccumulator.cpp",
-        "CursorInputMapper.cpp",
-        "CursorScrollAccumulator.cpp",
         "EventHub.cpp",
-        "ExternalStylusInputMapper.cpp",
         "InputDevice.cpp",
-        "InputMapper.cpp",
+        "mapper/accumulator/CursorButtonAccumulator.cpp",
+        "mapper/accumulator/CursorScrollAccumulator.cpp",
+        "mapper/accumulator/SingleTouchMotionAccumulator.cpp",
+        "mapper/accumulator/TouchButtonAccumulator.cpp",
+        "mapper/CursorInputMapper.cpp",
+        "mapper/ExternalStylusInputMapper.cpp",
+        "mapper/InputMapper.cpp",
+        "mapper/JoystickInputMapper.cpp",
+        "mapper/KeyboardInputMapper.cpp",
+        "mapper/MultiTouchInputMapper.cpp",
+        "mapper/RotaryEncoderInputMapper.cpp",
+        "mapper/SingleTouchInputMapper.cpp",
+        "mapper/SwitchInputMapper.cpp",
+        "mapper/TouchInputMapper.cpp",
+        "mapper/VibratorInputMapper.cpp",
         "InputReader.cpp",
         "InputReaderFactory.cpp",
-        "JoystickInputMapper.cpp",
-        "KeyboardInputMapper.cpp",
-        "MultiTouchInputMapper.cpp",
-        "RotaryEncoderInputMapper.cpp",
-        "SingleTouchInputMapper.cpp",
-        "SingleTouchMotionAccumulator.cpp",
-        "SwitchInputMapper.cpp",
-        "TouchButtonAccumulator.cpp",
-        "TouchInputMapper.cpp",
         "TouchVideoDevice.cpp",
-        "VibratorInputMapper.cpp",
     ],
 
     shared_libs: [