From 60a42ccac53682b9cd7cea63f1c8a4525b44d331 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 3 Dec 2018 09:38:35 -0800
Subject: [PATCH] C++17 is the default now.

Test: builds
Change-Id: I64495775afe4ded7d3312cc35a154fecba64adc3
---
 core/jni/Android.bp              | 1 -
 libs/hwui/Android.bp             | 2 --
 startop/view_compiler/Android.bp | 1 -
 3 files changed, 4 deletions(-)

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 3326d1219e776..ec24980a2e6e3 100644
--- 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",
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 6533eb9a2d876..0a5b56b30e663 100644
--- 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",
diff --git a/startop/view_compiler/Android.bp b/startop/view_compiler/Android.bp
index 0c40a6b5fa848..de40e0df48e7d 100644
--- 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 {