Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2874d30f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "split-inputreader-file" 

* changes:
  Create inputmappers and accumulators directories
  Split InputReader into multiple files
  Create inputreader directory
parents 84d78e1d 2770d247

services/inputflinger/Android.bp

+0 −32
Original line number Diff line number Diff line
@@ -75,38 +75,6 @@ cc_library_headers { 
    export_header_lib_headers: ["libinputreporter_headers"],

}



cc_library_shared {

    name: "libinputreader",

    defaults: ["inputflinger_defaults"],



    srcs: [

        "EventHub.cpp",

        "InputReader.cpp",

        "InputReaderFactory.cpp",

        "TouchVideoDevice.cpp",

    ],



    shared_libs: [

        "libbase",

        "libinputflinger_base",

        "libcrypto",

        "libcutils",

        "libinput",

        "liblog",

        "libui",

        "libutils",

        "libhardware_legacy",

    ],



    header_libs: [

        "libinputflinger_headers",

    ],



    export_header_lib_headers: [

        "libinputflinger_headers",

    ],

}



cc_library_shared {

    name: "libinputflinger_base",

    defaults: ["inputflinger_defaults"],

services/inputflinger/InputManager.h

+0 −2
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 
 * Native input manager.

 */



#include "EventHub.h"

#include "InputClassifier.h"

#include "InputReader.h"

#include "InputReaderBase.h"



#include <InputDispatcherInterface.h>

services/inputflinger/reader/Android.bp

0 → 100644
+71 −0
Original line number Diff line number Diff line 
// Copyright (C) 2019 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



cc_library_headers {

    name: "libinputreader_headers",

    export_include_dirs: [

        "include",

        "mapper",

        "mapper/accumulator",

    ],

}



cc_library_shared {

    name: "libinputreader",

    defaults: ["inputflinger_defaults"],



    srcs: [

        "EventHub.cpp",

        "InputDevice.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",

        "TouchVideoDevice.cpp",

    ],



    shared_libs: [

        "libbase",

        "libinputflinger_base",

        "libcrypto",

        "libcutils",

        "libinput",

        "liblog",

        "libui",

        "libutils",

        "libhardware_legacy",

    ],



    header_libs: [

        "libinputflinger_headers",

        "libinputreader_headers",

    ],



    export_header_lib_headers: [

        "libinputflinger_headers",

    ],

}