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

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

Merge "Use -Werror in frameworks/base" 

am: 16fbd3a1

Change-Id: Iab69cf4f99cf4bedd12eb7764c773a893bfe5343
parents 7edf405c 16fbd3a1

Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ cc_library { 
        include_dirs: ["external/protobuf/src"],

    },



    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-unused-parameter",

    ],

    target: {

        host: {

            proto: {

cmds/am/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
cc_library_host_static {

    name: "libinstrumentation",

    srcs: ["**/*.proto"],

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

    proto: {

        type: "full",

        export_proto_headers: true,

tools/bit/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ cc_binary_host { 
        "util.cpp",

    ],



    cflags: [

        "-Wall",

        "-Werror",

    ],



    static_libs: [

        "libexpat",

        "libinstrumentation",

tools/bit/adb.cpp

+3 −1
Original line number Diff line number Diff line
@@ -293,7 +293,9 @@ run_instrumentation_test(const string& packageName, const string& runner, const 
    print_command(cmd);



    int fds[2];

    pipe(fds);

    if (0 != pipe(fds)) {

        return errno;

    }



    pid_t pid = fork();

tools/bit/command.cpp

+3 −1
Original line number Diff line number Diff line
@@ -105,7 +105,9 @@ get_command_output(const Command& command, int* err, bool quiet) 
    }



    int fds[2];

    pipe(fds);

    if (0 != pipe(fds)) {

        return string();

    }



    pid_t pid = fork();