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

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

Merge "Use -Werror in frameworks/native/cmds" am: afee092b am: f0379485 

am: ea5bc92b

Change-Id: I9a3f0b5db423af1ec2925f0a0ca7307bda9b6f3a
parents 31e18006 ea5bc92b

cmds/atrace/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
cc_binary {

    name: "atrace",

    srcs: ["atrace.cpp"],

    cflags: [

        "-Wall",

        "-Werror",

    ],



    shared_libs: [

        "libbinder",

cmds/atrace/atrace.cpp

+6 −4
Original line number Diff line number Diff line
@@ -226,8 +226,11 @@ static const char* k_traceClockPath = 
static const char* k_traceBufferSizePath =

    "buffer_size_kb";



#if 0

// TODO: Re-enable after stabilization

static const char* k_traceCmdlineSizePath =

    "saved_cmdlines_size";

#endif



static const char* k_tracingOverwriteEnablePath =

    "options/overwrite";
@@ -250,9 +253,6 @@ static const char* k_funcgraphProcPath = 
static const char* k_funcgraphFlatPath =

    "options/funcgraph-flat";



static const char* k_funcgraphDurationPath =

    "options/funcgraph-duration";



static const char* k_ftraceFilterPath =

    "set_ftrace_filter";
@@ -445,7 +445,6 @@ static bool clearTrace() 
static bool setTraceBufferSizeKB(int size)

{

    char str[32] = "1";

    int len;

    if (size < 1) {

        size = 1;

    }
@@ -453,6 +452,8 @@ static bool setTraceBufferSizeKB(int size) 
    return writeStr(k_traceBufferSizePath, str);

}



#if 0

// TODO: Re-enable after stabilization

// Set the default size of cmdline hashtable

static bool setCmdlineSize()

{
@@ -461,6 +462,7 @@ static bool setCmdlineSize() 
    }

    return true;

}

#endif



// Set the clock to the best available option while tracing. Use 'boot' if it's

// available; otherwise, use 'mono'. If neither are available use 'global'.

cmds/bugreport/Android.bp

+1 −1
Original line number Diff line number Diff line 
cc_binary {

    name: "bugreport",

    srcs: ["bugreport.cpp"],

    cflags: ["-Wall"],

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

    shared_libs: ["libcutils"],

}

cmds/dumpsys/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ cc_test { 
    test_suites: ["device-tests"],



    srcs: ["dumpsys_test.cpp"],

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



    shared_libs: [

        "libbase",

cmds/installd/tests/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ cc_test { 
    name: "installd_utils_test",

    clang: true,

    srcs: ["installd_utils_test.cpp"],

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

    shared_libs: [

        "libbase",

        "liblog",
@@ -19,6 +20,7 @@ cc_test { 
    name: "installd_cache_test",

    clang: true,

    srcs: ["installd_cache_test.cpp"],

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

    shared_libs: [

        "libbase",

        "libbinder",
@@ -38,6 +40,7 @@ cc_test { 
    name: "installd_service_test",

    clang: true,

    srcs: ["installd_service_test.cpp"],

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

    shared_libs: [

        "libbase",

        "libbinder",