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

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

Merge "Allow implicit-fallthrough warnings locally." am: 36afe11a am: 9c573823 

am: 469705cc

Change-Id: I4bc5f389495ed535762438632e65ccd6c66f3739
parents c18cd05c 469705cc

libs/androidfw/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ cc_library { 
        "ZipFileRO.cpp",

        "ZipUtils.cpp",

    ],

    // Allow implicit fallthroughs in Locale.cpp and ResourceTypes.cpp until they are fixed.

    cflags: ["-Wno-implicit-fallthrough"],

    export_include_dirs: ["include"],

    export_shared_lib_headers: ["libz"],

    target: {

media/jni/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ cc_library_shared { 
        "-Wno-error=deprecated-declarations",

        "-Wunused",

        "-Wunreachable-code",

        // Allow implicit fallthroughs in android_media_MediaScanner.cpp and

        // android_mtp_MtpDatabase.cpp until they are fixed.

        "-Wno-error=implicit-fallthrough",

    ],

}

tools/aapt/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ cc_library_host_static { 
    cflags: [

        "-Wno-format-y2k",

        "-DSTATIC_ANDROIDFW_FOR_TOOLS",

        // Allow implicit fallthroughs in AaptAssets.cpp until they are fixed.

        "-Wno-error=implicit-fallthrough",

    ],



    srcs: [

tools/incident_section_gen/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ cc_binary_host { 
        "-O0",

        "-Wall",

        "-Werror",

        // Allow implicit fallthroughs in main.cpp until they are fixed.

        "-Wno-error=implicit-fallthrough",

    ],

    srcs: ["main.cpp"],

    shared_libs: [