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

Commit a2977096 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Use -Werror in frameworks/native/services/inputflinger" am: 4d6bb5a8 

am: d1e64c72

Change-Id: I227a8dea87e0caaf8efcdcf21a7c6ee736504e62
parents de5c8a55 d1e64c72

services/inputflinger/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ cc_library_shared { 
    ],



    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

        "-Wno-unused-parameter",

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

        //-fvisibility=hidden

services/inputflinger/EventHub.cpp

+0 −6
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ namespace android { 
static const char *WAKE_LOCK_ID = "KeyEvents";

static const char *DEVICE_PATH = "/dev/input";



/* return the larger integer */

static inline int max(int v1, int v2)

{

    return (v1 > v2) ? v1 : v2;

}



static inline const char* toString(bool value) {

    return value ? "true" : "false";

}

services/inputflinger/InputDispatcher.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1132,8 +1132,6 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
        INJECTION_PERMISSION_DENIED

    };



    nsecs_t startTime = now();



    // For security reasons, we defer updating the touch state until we are sure that

    // event injection will be allowed.

    int32_t displayId = entry->displayId;

services/inputflinger/host/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ cc_library_shared { 
    ],



    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-unused-parameter",

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

        //-fvisibility=hidden
@@ -47,6 +49,8 @@ cc_binary { 


    srcs: ["main.cpp"],



    cflags: ["-Wall", "-Werror"],



    shared_libs: [

        "libbinder",

        "libinputflingerhost",

services/inputflinger/tests/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -7,7 +7,11 @@ cc_test { 
        "InputDispatcher_test.cpp",

    ],

    test_per_src: true,

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

    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-unused-parameter",

    ],

    shared_libs = [

        "libcutils",

        "liblog",