Merge "C++17 is the default now."
am: 8fc15c02bd
Change-Id: Ifdbf426e445f1527c0f17c2a1e2901c084f8140c
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 {
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",