Merge "C++17 is the default now." am: fbb102ea84 am: ccb3d1d61a

am: 8dd21cd6b5 Change-Id: I79e72e3a99c9590fdbaab72507044aa85dfa38ef
2018-12-03 18:05:24 -08:00
parent 60cd20ed9b 8dd21cd6b5
commit 01fb624e09
3 changed files with 0 additions and 4 deletions
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -34,7 +34,6 @@ cc_library_shared {
    ],

    cppflags: ["-Wno-conversion-null"],
-    cpp_std: "c++17",

    srcs: [
        "AndroidRuntime.cpp",
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -9,8 +9,6 @@ cc_defaults {
        "hwui_lto",
    ],

-    cpp_std: "c++17",
-
    cflags: [
        "-DEGL_EGLEXT_PROTOTYPES",
        "-DGL_GLEXT_PROTOTYPES",
--- a/startop/view_compiler/Android.bp
+++ b/startop/view_compiler/Android.bp
@@ -24,7 +24,6 @@ cc_defaults {
        "libdexfile",
        "slicer",
    ],
-    cppflags: ["-std=c++17"],
 }

 cc_library_host_static {