commit b39caf5763c932e342330570fa23625150556c29
author Elliott Hughes <enh@google.com> Wed Dec 05 13:16:03 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 05 13:16:03 2018 -0800
tree 1207bcb4f3253d19c092ed6cc224a4544bdf8779
parent 22f25cf01f8bdefdf55aa0c57b7b1414828fdd20
parent 9c4f9380ae750b0243a9b46f70b66737ba4d7f2a

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

Change-Id: Iaf8fce0da5e8adb24a1213b5a88f2eed36095e76

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