commit 42c2f242f83da732adec3b852cd6d02f616312f3
author Elliott Hughes <enh@google.com> Wed Dec 05 13:24:28 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 05 13:24:28 2018 -0800
tree 6970b16ea6d382bd52979d25221dc5ec56efe640
parent 0de8b419c390c65a7e95058493860100984f8f93
parent b39caf5763c932e342330570fa23625150556c29

Merge "C++17 is now the default." am: 538a4e789e am: 9c4f9380ae
am: b39caf5763

Change-Id: I458e558adff8125b0a163635185ed86e06eaf1f3

keystore-engine/Android.bp

diff --git a/keystore-engine/Android.bp b/keystore-engine/Android.bp
index e7cd09d..60f5940 100644
--- a/keystore-engine/Android.bp
+++ b/keystore-engine/Android.bp
@@ -25,7 +25,6 @@
         "-Wall",
         "-Werror",
     ],
-    cpp_std: "c++17",
 
     shared_libs: [
         "libbinder",
@@ -58,7 +57,6 @@
         "-Werror",
         "-DBACKEND_WIFI_HIDL",
     ],
-    cpp_std: "c++17",
 
     shared_libs: [
         "android.system.wifi.keystore@1.0",