commit 713313d8ed08b1f7597298696f66c2fe59063f2d
author Elliott Hughes <enh@google.com> Mon Dec 03 15:07:03 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 03 15:07:03 2018 -0800
tree 4521cf83da3387af15fcca951e735a0216877bc0
parent 84e9e60b0f250d92ebb5992c1b25cccb47455c08
parent 4d371e77e1c3267f3d2aba06000eb8c5416de818

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

Change-Id: Ib647755e7a1d69bf60368605a28c7aedb5bf39c7

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",