commit 4d371e77e1c3267f3d2aba06000eb8c5416de818
author Elliott Hughes <enh@google.com> Mon Dec 03 14:43:14 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 03 14:43:14 2018 -0800
tree 3ef7f1eabc4c83c2f10492550e7e9361e01525df
parent 7cd903019639b62a30f2c1d510837c0d5a26e0e7
parent 9f909492c0b5593e0d3f3e024a9ae2d88a710623

Merge "C++17 is the default now." am: 8fc15c02bd
am: 9f909492c0

Change-Id: Ic872f06bae64f5ee90db002043132a2de7c7ba02

Android.bp

diff --git a/Android.bp b/Android.bp
index c28dc3b..41075d2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,8 +24,6 @@
         "-Wall",
         "-Werror",
     ],
-
-    cpp_std: "c++17",
 }
 
 cc_library {

minadbd/Android.bp

diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 7e33261..370232b 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -15,7 +15,6 @@
 cc_defaults {
     name: "minadbd_defaults",
 
-    cpp_std: "gnu++17",
     cflags: [
         "-DADB_HOST=0",
         "-Wall",