summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2017-08-02 16:06:28 -0500
committerElliott Hughes2017-08-02 16:06:28 -0500
commit972d078b3ec796e5cd3d0dbc8607782ec6e4a90b (patch)
tree33863a3976b3917eaf5d3db2e55aa6fa85e62343
parent0d2cac9ea8000933cf4beb3c3066a26877b44ba8 (diff)
downloadplatform-system-core-972d078b3ec796e5cd3d0dbc8607782ec6e4a90b.tar.gz
platform-system-core-972d078b3ec796e5cd3d0dbc8607782ec6e4a90b.tar.xz
platform-system-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 {
2 name: "crasher-defaults", 2 name: "crasher-defaults",
3 3
4 cppflags: [ 4 cppflags: [
5 "-std=gnu++14",
6 "-W", 5 "-W",
7 "-Wall", 6 "-Wall",
8 "-Wextra", 7 "-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)
19include $(CLEAR_VARS) 19include $(CLEAR_VARS)
20LOCAL_MODULE := gatekeeperd-unit-tests 20LOCAL_MODULE := gatekeeperd-unit-tests
21LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 21LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
22LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers 22LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers
23LOCAL_SHARED_LIBRARIES := libgatekeeper libcrypto libbase 23LOCAL_SHARED_LIBRARIES := libgatekeeper libcrypto libbase
24LOCAL_STATIC_LIBRARIES := libscrypt_static 24LOCAL_STATIC_LIBRARIES := libscrypt_static
25LOCAL_C_INCLUDES := external/scrypt/lib/crypto 25LOCAL_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 {
21 "-g", 21 "-g",
22 "-Wall", 22 "-Wall",
23 "-Werror", 23 "-Werror",
24 "-std=gnu++11",
25 "-Wno-missing-field-initializers", 24 "-Wno-missing-field-initializers",
26 ], 25 ],
27 26