commit a617d863e57dc65213e7e136b383830770544882
author Elliott Hughes <enh@google.com> Thu Aug 03 02:37:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 03 02:37:39 2017 +0000
tree 384494352123622fa7b6fa951fe09ae0e7f0e463
parent 256008f87589d0c5e735707b0e20614c81402705
parent 407c07618cfde802b3eccd9d29273bedaf02af83

Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf21 am: 0915192d8b am: 514464f4ca
am: cb6e5d6ed2

Change-Id: Id7cbfd270890da3a29b10393f10bd128d219f9e5

debuggerd/crasher/Android.bp

diff --git a/debuggerd/crasher/Android.bp b/debuggerd/crasher/Android.bp
index f73f672..b7b1938 100644
--- a/debuggerd/crasher/Android.bp
+++ b/debuggerd/crasher/Android.bp
@@ -2,7 +2,6 @@
     name: "crasher-defaults",
 
     cppflags: [
-        "-std=gnu++14",
         "-W",
         "-Wall",
         "-Wextra",

gatekeeperd/tests/Android.mk

diff --git a/gatekeeperd/tests/Android.mk b/gatekeeperd/tests/Android.mk
index a62b1d4..c38c64b 100644
--- a/gatekeeperd/tests/Android.mk
+++ b/gatekeeperd/tests/Android.mk
@@ -19,7 +19,7 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := gatekeeperd-unit-tests
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers
+LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers
 LOCAL_SHARED_LIBRARIES := libgatekeeper libcrypto libbase
 LOCAL_STATIC_LIBRARIES := libscrypt_static
 LOCAL_C_INCLUDES := external/scrypt/lib/crypto

trusty/storage/tests/Android.bp

diff --git a/trusty/storage/tests/Android.bp b/trusty/storage/tests/Android.bp
index 3eff3f2..1e4fced 100644
--- a/trusty/storage/tests/Android.bp
+++ b/trusty/storage/tests/Android.bp
@@ -21,7 +21,6 @@
         "-g",
         "-Wall",
         "-Werror",
-        "-std=gnu++11",
         "-Wno-missing-field-initializers",
     ],