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

Commit 8178e155 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "C++14 has been the default for a while now." am: d39da494 am: 67a2f02d 

am: daf68ee1

Change-Id: I6ef58ac2e23c56fad3883777b59e4918bbfef295
parents 0f2525cd daf68ee1

vulkan/nulldrv/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ cc_library_shared { 
        "-DLOG_NDEBUG=0",

        "-DLOG_NDEBUG=0",

    ],

    ],

    cppflags: [

    cppflags: [

        "-std=c++1y",

        "-Wno-c++98-compat-pedantic",

        "-Wno-c++98-compat-pedantic",

        "-Wno-c99-extensions",

        "-Wno-c99-extensions",

    ],

    ],

vulkan/tools/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ cc_binary { 
        "-Wno-switch-enum",

        "-Wno-switch-enum",

    ],

    ],

    cppflags: [

    cppflags: [

        "-std=c++1y",

        "-Wno-c++98-compat-pedantic",

        "-Wno-c++98-compat-pedantic",

        "-Wno-c99-extensions",

        "-Wno-c99-extensions",

        "-Wno-old-style-cast",

        "-Wno-old-style-cast",