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

Commit 01fb624e authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "C++17 is the default now." am: fbb102ea am: ccb3d1d6 

am: 8dd21cd6

Change-Id: I79e72e3a99c9590fdbaab72507044aa85dfa38ef
parents 60cd20ed 8dd21cd6

core/jni/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ cc_library_shared { 
    ],

    ],





    cppflags: ["-Wno-conversion-null"],

    cppflags: ["-Wno-conversion-null"],

    cpp_std: "c++17",





    srcs: [

    srcs: [

        "AndroidRuntime.cpp",

        "AndroidRuntime.cpp",

libs/hwui/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -9,8 +9,6 @@ cc_defaults { 
        "hwui_lto",

        "hwui_lto",

    ],

    ],





    cpp_std: "c++17",



    cflags: [

    cflags: [

        "-DEGL_EGLEXT_PROTOTYPES",

        "-DEGL_EGLEXT_PROTOTYPES",

        "-DGL_GLEXT_PROTOTYPES",

        "-DGL_GLEXT_PROTOTYPES",

startop/view_compiler/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ cc_defaults { 
        "libdexfile",

        "libdexfile",

        "slicer",

        "slicer",

    ],

    ],

    cppflags: ["-std=c++17"],

}

}





cc_library_host_static {

cc_library_host_static {