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

Commit 4c4ac1c2 authored by Stephen Hines's avatar Stephen Hines Committed by android-build-merger
Browse files

Merge "NFC: Fix implicit fallthrough warning." 

am: 30fc8829

Change-Id: I1837ef1eee710248fde3e7d7c7d9a5101de9a69a
parents 0dd9daed 30fc8829

tools/aapt/AaptAssets.cpp

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ int AaptLocaleValue::initFromDirName(const Vector<String8>& parts, const int sta 
                        break;

                    }

                    // This is not alphabetical, so we fall through to variant

                    [[fallthrough]];

                case 5:

                case 6:

                case 7:

tools/aapt/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ 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: [