summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2017-08-02 14:06:28 -0700
committerElliott Hughes <enh@google.com>2017-08-02 14:06:28 -0700
commit972d078b3ec796e5cd3d0dbc8607782ec6e4a90b (patch)
tree33863a3976b3917eaf5d3db2e55aa6fa85e62343
parent0d2cac9ea8000933cf4beb3c3066a26877b44ba8 (diff)
downloadcore-972d078b3ec796e5cd3d0dbc8607782ec6e4a90b.tar.gz
core-972d078b3ec796e5cd3d0dbc8607782ec6e4a90b.tar.bz2
core-972d078b3ec796e5cd3d0dbc8607782ec6e4a90b.zip
Stop asking for old versions of C++ in system/core.
Bug: http://b/32019064 Test: builds Change-Id: I1befc647b581bd293f98010e816b6413caab5e6c
-rw-r--r--debuggerd/crasher/Android.bp1
-rw-r--r--gatekeeperd/tests/Android.mk2
-rw-r--r--trusty/storage/tests/Android.bp1
3 files changed, 1 insertions, 3 deletions
diff --git a/debuggerd/crasher/Android.bp b/debuggerd/crasher/Android.bp
index f73f672fb..b7b19384b 100644
--- a/debuggerd/crasher/Android.bp
+++ b/debuggerd/crasher/Android.bp
@@ -2,7 +2,6 @@ cc_defaults {
name: "crasher-defaults",
cppflags: [
- "-std=gnu++14",
"-W",
"-Wall",
"-Wextra",
diff --git a/gatekeeperd/tests/Android.mk b/gatekeeperd/tests/Android.mk
index a62b1d424..c38c64be8 100644
--- a/gatekeeperd/tests/Android.mk
+++ b/gatekeeperd/tests/Android.mk
@@ -19,7 +19,7 @@ LOCAL_PATH:= $(call my-dir)
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
diff --git a/trusty/storage/tests/Android.bp b/trusty/storage/tests/Android.bp
index 3eff3f27a..1e4fced8f 100644
--- a/trusty/storage/tests/Android.bp
+++ b/trusty/storage/tests/Android.bp
@@ -21,7 +21,6 @@ cc_test {
"-g",
"-Wall",
"-Werror",
- "-std=gnu++11",
"-Wno-missing-field-initializers",
],