1 files changed, 6 insertions, 91 deletions

diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index a63ec8fb2a..8efaf3d90b 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -14,26 +14,6 @@
 
 // libinput is partially built for the host (used by build time keymap validation tool)
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "frameworks_native_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_native_license"],
-}
-
-filegroup {
-    name: "inputconstants_aidl",
-    srcs: [
-        "android/os/BlockUntrustedTouchesMode.aidl",
-        "android/os/IInputConstants.aidl",
-        "android/os/InputEventInjectionResult.aidl",
-        "android/os/InputEventInjectionSync.aidl",
-        "android/os/TouchOcclusionMode.aidl",
-    ],
-}
-
 cc_library {
     name: "libinput",
     host_supported: true,
@@ -45,54 +25,34 @@ cc_library {
     srcs: [
         "Input.cpp",
         "InputDevice.cpp",
-        "InputEventLabels.cpp",
         "Keyboard.cpp",
         "KeyCharacterMap.cpp",
         "KeyLayoutMap.cpp",
-        "PropertyMap.cpp",
         "TouchVideoFrame.cpp",
-        "VelocityControl.cpp",
-        "VelocityTracker.cpp",
         "VirtualKeyMap.cpp",
     ],
 
     clang: true,
 
-    header_libs: ["jni_headers"],
-    export_header_lib_headers: ["jni_headers"],
-
     shared_libs: [
         "libbase",
         "liblog",
         "libcutils",
     ],
 
-    static_libs: [
-        "libui-types",
-    ],
-
-    export_static_lib_headers: [
-        "libui-types",
-    ],
-
     target: {
         android: {
             srcs: [
+                "IInputFlinger.cpp",
+                "InputApplication.cpp",
                 "InputTransport.cpp",
                 "InputWindow.cpp",
-                "android/FocusRequest.aidl",
-                "android/InputApplicationInfo.aidl",
-                "android/os/BlockUntrustedTouchesMode.aidl",
-                "android/os/IInputConstants.aidl",
-                "android/os/IInputFlinger.aidl",
-                "android/os/InputEventInjectionResult.aidl",
-                "android/os/InputEventInjectionSync.aidl",
-                "android/os/ISetInputWindowsListener.aidl",
-                "android/os/TouchOcclusionMode.aidl",
+                "ISetInputWindowsListener.cpp",
+                "LatencyStatistics.cpp",
+                "VelocityControl.cpp",
+                "VelocityTracker.cpp",
             ],
 
-            export_shared_lib_headers: ["libbinder"],
-
             shared_libs: [
                 "libutils",
                 "libbinder",
@@ -107,53 +67,8 @@ cc_library {
             shared: {
                 enabled: false,
             },
-            include_dirs: [
-                "frameworks/native/libs/arect/include",
-            ],
-        },
-        linux_glibc: {
-            srcs: [
-                "InputTransport.cpp",
-                "InputWindow.cpp",
-                "android/FocusRequest.aidl",
-                "android/InputApplicationInfo.aidl",
-                "android/os/IInputConstants.aidl",
-                "android/os/IInputFlinger.aidl",
-                "android/os/ISetInputWindowsListener.aidl",
-                "android/os/TouchOcclusionMode.aidl",
-            ],
-            static_libs: [
-                "libhostgraphics",
-            ],
-            shared_libs: [
-                "libbinder",
-            ],
         },
     },
-
-    aidl: {
-        local_include_dirs: ["."],
-        export_aidl_headers: true,
-    },
-}
-
-cc_defaults {
-    name: "libinput_fuzz_defaults",
-    host_supported: true,
-    shared_libs: [
-        "libutils",
-        "libbase",
-        "liblog",
-    ],
-}
-
-cc_fuzz {
-    name: "libinput_fuzz_propertymap",
-    defaults: ["libinput_fuzz_defaults"],
-    srcs: [
-        "PropertyMap.cpp",
-        "PropertyMap_fuzz.cpp",
-    ],
 }
 
 subdirs = ["tests"]