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

Commit 03435277 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Convert inputflinger to Android.bp"

parents 4f0ed17b 45a1b9c9

services/inputflinger/Android.bp

0 → 100644
+51 −0
Original line number Diff line number Diff line 
// Copyright (C) 2013 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_shared {

    name: "libinputflinger",



    srcs: [

        "EventHub.cpp",

        "InputApplication.cpp",

        "InputDispatcher.cpp",

        "InputListener.cpp",

        "InputManager.cpp",

        "InputReader.cpp",

        "InputWindow.cpp",

    ],



    shared_libs: [

        "libbinder",

        "libcrypto",

        "libcutils",

        "libinput",

        "liblog",

        "libutils",

        "libui",

        "libhardware_legacy",

    ],



    cflags: [

        "-Wno-unused-parameter",

        // TODO: Move inputflinger to its own process and mark it hidden

        //-fvisibility=hidden

    ],



    export_include_dirs: ["."],

}



subdirs = [

    "host",

    "tests",

]

services/inputflinger/Android.mk

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
# Copyright (C) 2013 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.



LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

    EventHub.cpp \

    InputApplication.cpp \

    InputDispatcher.cpp \

    InputListener.cpp \

    InputManager.cpp \

    InputReader.cpp \

    InputWindow.cpp



LOCAL_SHARED_LIBRARIES := \

    libbinder \

    libcrypto \

    libcutils \

    libinput \

    liblog \

    libutils \

    libui \

    libhardware_legacy





# TODO: Move inputflinger to its own process and mark it hidden

#LOCAL_CFLAGS += -fvisibility=hidden



LOCAL_CFLAGS += -Wno-unused-parameter



LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)



LOCAL_MODULE := libinputflinger



include $(BUILD_SHARED_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))

services/inputflinger/host/Android.bp

0 → 100644
+57 −0
Original line number Diff line number Diff line 
// Copyright (C) 2015 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_shared {

    name: "libinputflingerhost",



    srcs: [

        "InputFlinger.cpp",

        "InputDriver.cpp",

        "InputHost.cpp",

    ],



    shared_libs: [

        "libbinder",

        "libcrypto",

        "libcutils",

        "libinput",

        "liblog",

        "libutils",

        "libhardware",

    ],



    cflags: [

        "-Wno-unused-parameter",

        // TODO: Move inputflinger to its own process and mark it hidden

        //-fvisibility=hidden

    ],



    export_include_dirs: ["."],

}



//#######################################################################

// build input flinger executable

cc_binary {

    name: "inputflinger",



    srcs: ["main.cpp"],



    shared_libs: [

        "libbinder",

        "libinputflingerhost",

        "libutils",

    ],



    init_rc: ["inputflinger.rc"],

}

services/inputflinger/host/Android.mk

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
# Copyright (C) 2015 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.



LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_CLANG := true



LOCAL_SRC_FILES:= \

    InputFlinger.cpp \

    InputDriver.cpp \

    InputHost.cpp



LOCAL_SHARED_LIBRARIES := \

    libbinder \

    libcrypto \

    libcutils \

    libinput \

    liblog \

    libutils \

    libhardware





# TODO: Move inputflinger to its own process and mark it hidden

#LOCAL_CFLAGS += -fvisibility=hidden



LOCAL_CFLAGS += -Wno-unused-parameter



LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)



LOCAL_MODULE := libinputflingerhost



include $(BUILD_SHARED_LIBRARY)



########################################################################

# build input flinger executable

include $(CLEAR_VARS)



LOCAL_CLANG := true



LOCAL_SRC_FILES:= \

	main.cpp



LOCAL_SHARED_LIBRARIES := \

	libbinder \

	libinputflingerhost \

	libutils



LOCAL_MODULE := inputflinger

LOCAL_INIT_RC := inputflinger.rc



include $(BUILD_EXECUTABLE)

services/inputflinger/tests/Android.bp

0 → 100644
+23 −0
Original line number Diff line number Diff line 
// Build the unit tests.



cc_test {

    name: "inputflinger_tests",

    srcs: [

        "InputReader_test.cpp",

        "InputDispatcher_test.cpp",

    ],

    test_per_src: true,

    cflags: ["-Wno-unused-parameter"],

    shared_libs = [

        "libcutils",

        "liblog",

        "libutils",

        "libhardware",

        "libhardware_legacy",

        "libui",

        "libskia",

        "libinput",

        "libinputflinger",

        "libinputservice",

    ],

}