summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2016-10-10 16:31:12 -0500
committerElliott Hughes2016-10-10 16:31:12 -0500
commit36e0d390a2de7d13cdf667d9a7d125f0d66b3107 (patch)
treeb7ae89c6bbe40c5e820b8ddc2e2f073a67794911
parent0d762648d0b9cb29f13f3f8cb7815236078fafbd (diff)
downloadplatform-system-core-36e0d390a2de7d13cdf667d9a7d125f0d66b3107.tar.gz
platform-system-core-36e0d390a2de7d13cdf667d9a7d125f0d66b3107.tar.xz
platform-system-core-36e0d390a2de7d13cdf667d9a7d125f0d66b3107.zip
Rely on the platform -std default.
Bug: http://b/32019064 Test: builds Change-Id: I18a1d816d63b64601485045070851f32d44e85eb
-rw-r--r--adb/Android.mk2
-rw-r--r--debuggerd/Android.mk1
-rw-r--r--fastboot/Android.mk1
-rw-r--r--libbacktrace/Android.bp2
-rw-r--r--libbacktrace/Android.mk6
-rw-r--r--libcrypto_utils/Android.bp1
-rw-r--r--libcrypto_utils/tests/Android.mk2
-rw-r--r--libcutils/Android.bp4
-rw-r--r--liblog/tests/Android.mk2
-rw-r--r--libmemunreachable/Android.bp1
-rw-r--r--libnativebridge/Android.bp1
-rw-r--r--libnativebridge/tests/Android.mk2
-rw-r--r--libnativebridge/tests/Android.nativebridge-dummy.mk8
-rw-r--r--libnativeloader/Android.bp1
-rw-r--r--libsync/Android.bp1
-rw-r--r--logcat/tests/Android.mk1
-rw-r--r--logwrapper/Android.bp2
-rw-r--r--toolbox/Android.mk1
18 files changed, 5 insertions, 34 deletions
diff --git a/adb/Android.mk b/adb/Android.mk
index 0114ca37b..41d376292 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -18,11 +18,9 @@ ADB_COMMON_CFLAGS := \
18 -DADB_REVISION='"$(adb_version)"' \ 18 -DADB_REVISION='"$(adb_version)"' \
19 19
20ADB_COMMON_linux_CFLAGS := \ 20ADB_COMMON_linux_CFLAGS := \
21 -std=c++14 \
22 -Wexit-time-destructors \ 21 -Wexit-time-destructors \
23 22
24ADB_COMMON_darwin_CFLAGS := \ 23ADB_COMMON_darwin_CFLAGS := \
25 -std=c++14 \
26 -Wexit-time-destructors \ 24 -Wexit-time-destructors \
27 25
28# Define windows.h and tchar.h Unicode preprocessor symbols so that 26# Define windows.h and tchar.h Unicode preprocessor symbols so that
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index fdedb767e..1fc850f38 100644
--- a/debuggerd/Android.mk
+++ b/debuggerd/Android.mk
@@ -1,7 +1,6 @@
1LOCAL_PATH := $(call my-dir) 1LOCAL_PATH := $(call my-dir)
2 2
3common_cppflags := \ 3common_cppflags := \
4 -std=gnu++11 \
5 -W \ 4 -W \
6 -Wall \ 5 -Wall \
7 -Wextra \ 6 -Wextra \
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 7112d1dc0..b950e9c35 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -38,7 +38,6 @@ LOCAL_SRC_FILES := \
38LOCAL_MODULE := fastboot 38LOCAL_MODULE := fastboot
39LOCAL_MODULE_TAGS := debug 39LOCAL_MODULE_TAGS := debug
40LOCAL_MODULE_HOST_OS := darwin linux windows 40LOCAL_MODULE_HOST_OS := darwin linux windows
41LOCAL_CONLYFLAGS += -std=gnu99
42LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code 41LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code
43 42
44LOCAL_CFLAGS += -DFASTBOOT_REVISION='"$(fastboot_version)"' 43LOCAL_CFLAGS += -DFASTBOOT_REVISION='"$(fastboot_version)"'
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 93d997bf7..85b559768 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -21,8 +21,6 @@ cc_defaults {
21 "-Wall", 21 "-Wall",
22 "-Werror", 22 "-Werror",
23 ], 23 ],
24 conlyflags: ["-std=gnu99"],
25 cppflags: ["-std=gnu++11"],
26 24
27 clang_cflags: ["-Wno-inline-asm"], 25 clang_cflags: ["-Wno-inline-asm"],
28 26
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 56a397016..bb1732587 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -20,12 +20,6 @@ libbacktrace_common_cflags := \
20 -Wall \ 20 -Wall \
21 -Werror \ 21 -Werror \
22 22
23libbacktrace_common_conlyflags := \
24 -std=gnu99 \
25
26libbacktrace_common_cppflags := \
27 -std=gnu++11 \
28
29libbacktrace_common_c_includes := \ 23libbacktrace_common_c_includes := \
30 external/libunwind/include/tdep \ 24 external/libunwind/include/tdep \
31 25
diff --git a/libcrypto_utils/Android.bp b/libcrypto_utils/Android.bp
index ca7bd3119..f2560e6a3 100644
--- a/libcrypto_utils/Android.bp
+++ b/libcrypto_utils/Android.bp
@@ -24,7 +24,6 @@ cc_library {
24 "-Wall", 24 "-Wall",
25 "-Wextra", 25 "-Wextra",
26 "-Werror", 26 "-Werror",
27 "-std=c99",
28 ], 27 ],
29 local_include_dirs: ["include"], 28 local_include_dirs: ["include"],
30 export_include_dirs: ["include"], 29 export_include_dirs: ["include"],
diff --git a/libcrypto_utils/tests/Android.mk b/libcrypto_utils/tests/Android.mk
index bdaef71f2..ef3d0cf57 100644
--- a/libcrypto_utils/tests/Android.mk
+++ b/libcrypto_utils/tests/Android.mk
@@ -19,6 +19,6 @@ LOCAL_PATH := $(call my-dir)
19include $(CLEAR_VARS) 19include $(CLEAR_VARS)
20LOCAL_MODULE := libcrypto_utils_test 20LOCAL_MODULE := libcrypto_utils_test
21LOCAL_SRC_FILES := android_pubkey_test.cpp 21LOCAL_SRC_FILES := android_pubkey_test.cpp
22LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c++11 22LOCAL_CFLAGS := -Wall -Werror -Wextra
23LOCAL_SHARED_LIBRARIES := libcrypto_utils libcrypto 23LOCAL_SHARED_LIBRARIES := libcrypto_utils libcrypto
24include $(BUILD_HOST_NATIVE_TEST) 24include $(BUILD_HOST_NATIVE_TEST)
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 8624d13f5..211070177 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -95,10 +95,6 @@ cc_library {
95 95
96 static_libs: ["libdebuggerd_client"], 96 static_libs: ["libdebuggerd_client"],
97 export_static_lib_headers: ["libdebuggerd_client"], 97 export_static_lib_headers: ["libdebuggerd_client"],
98
99 cflags: [
100 "-std=gnu90",
101 ],
102 }, 98 },
103 99
104 android_arm: { 100 android_arm: {
diff --git a/liblog/tests/Android.mk b/liblog/tests/Android.mk
index a755b980c..158987a25 100644
--- a/liblog/tests/Android.mk
+++ b/liblog/tests/Android.mk
@@ -28,7 +28,6 @@ benchmark_c_flags := \
28 -Wall -Wextra \ 28 -Wall -Wextra \
29 -Werror \ 29 -Werror \
30 -fno-builtin \ 30 -fno-builtin \
31 -std=gnu++11
32 31
33benchmark_src_files := \ 32benchmark_src_files := \
34 benchmark_main.cpp \ 33 benchmark_main.cpp \
@@ -54,7 +53,6 @@ test_c_flags := \
54 -Wall -Wextra \ 53 -Wall -Wextra \
55 -Werror \ 54 -Werror \
56 -fno-builtin \ 55 -fno-builtin \
57 -std=gnu++11
58 56
59test_src_files := \ 57test_src_files := \
60 liblog_test.cpp 58 liblog_test.cpp
diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp
index 85bc421c3..4662368fe 100644
--- a/libmemunreachable/Android.bp
+++ b/libmemunreachable/Android.bp
@@ -2,7 +2,6 @@ cc_defaults {
2 name: "libmemunreachable_defaults", 2 name: "libmemunreachable_defaults",
3 3
4 cflags: [ 4 cflags: [
5 "-std=c++14",
6 "-Wall", 5 "-Wall",
7 "-Wextra", 6 "-Wextra",
8 "-Werror", 7 "-Werror",
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index 598dfcdc9..5fb56f2d0 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -12,7 +12,6 @@ cc_library {
12 "-Wall", 12 "-Wall",
13 ], 13 ],
14 cppflags: [ 14 cppflags: [
15 "-std=gnu++11",
16 "-fvisibility=protected", 15 "-fvisibility=protected",
17 ], 16 ],
18 17
diff --git a/libnativebridge/tests/Android.mk b/libnativebridge/tests/Android.mk
index 72659396c..5ad1569ed 100644
--- a/libnativebridge/tests/Android.mk
+++ b/libnativebridge/tests/Android.mk
@@ -31,7 +31,6 @@ shared_libraries := \
31$(foreach file,$(test_src_files), \ 31$(foreach file,$(test_src_files), \
32 $(eval include $(CLEAR_VARS)) \ 32 $(eval include $(CLEAR_VARS)) \
33 $(eval LOCAL_CLANG := true) \ 33 $(eval LOCAL_CLANG := true) \
34 $(eval LOCAL_CPPFLAGS := -std=gnu++11) \
35 $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ 34 $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
36 $(eval LOCAL_SRC_FILES := $(file)) \ 35 $(eval LOCAL_SRC_FILES := $(file)) \
37 $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ 36 $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
@@ -41,7 +40,6 @@ $(foreach file,$(test_src_files), \
41$(foreach file,$(test_src_files), \ 40$(foreach file,$(test_src_files), \
42 $(eval include $(CLEAR_VARS)) \ 41 $(eval include $(CLEAR_VARS)) \
43 $(eval LOCAL_CLANG := true) \ 42 $(eval LOCAL_CLANG := true) \
44 $(eval LOCAL_CPPFLAGS := -std=gnu++11) \
45 $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ 43 $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
46 $(eval LOCAL_SRC_FILES := $(file)) \ 44 $(eval LOCAL_SRC_FILES := $(file)) \
47 $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ 45 $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
diff --git a/libnativebridge/tests/Android.nativebridge-dummy.mk b/libnativebridge/tests/Android.nativebridge-dummy.mk
index 551765a39..e556f805f 100644
--- a/libnativebridge/tests/Android.nativebridge-dummy.mk
+++ b/libnativebridge/tests/Android.nativebridge-dummy.mk
@@ -12,7 +12,7 @@ LOCAL_MODULE:= libnativebridge-dummy
12LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) 12LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES)
13LOCAL_CLANG := true 13LOCAL_CLANG := true
14LOCAL_CFLAGS += -Werror -Wall 14LOCAL_CFLAGS += -Werror -Wall
15LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected 15LOCAL_CPPFLAGS := -fvisibility=protected
16LOCAL_SHARED_LIBRARIES := libdl 16LOCAL_SHARED_LIBRARIES := libdl
17LOCAL_MULTILIB := both 17LOCAL_MULTILIB := both
18 18
@@ -27,7 +27,7 @@ LOCAL_MODULE:= libnativebridge-dummy
27LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) 27LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES)
28LOCAL_CLANG := true 28LOCAL_CLANG := true
29LOCAL_CFLAGS += -Werror -Wall 29LOCAL_CFLAGS += -Werror -Wall
30LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected 30LOCAL_CPPFLAGS := -fvisibility=protected
31LOCAL_LDFLAGS := -ldl 31LOCAL_LDFLAGS := -ldl
32LOCAL_MULTILIB := both 32LOCAL_MULTILIB := both
33 33
@@ -48,7 +48,7 @@ LOCAL_MODULE:= libnativebridge2-dummy
48LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES) 48LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES)
49LOCAL_CLANG := true 49LOCAL_CLANG := true
50LOCAL_CFLAGS += -Werror -Wall 50LOCAL_CFLAGS += -Werror -Wall
51LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected 51LOCAL_CPPFLAGS := -fvisibility=protected
52LOCAL_SHARED_LIBRARIES := libdl 52LOCAL_SHARED_LIBRARIES := libdl
53LOCAL_MULTILIB := both 53LOCAL_MULTILIB := both
54 54
@@ -63,7 +63,7 @@ LOCAL_MODULE:= libnativebridge2-dummy
63LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES) 63LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES)
64LOCAL_CLANG := true 64LOCAL_CLANG := true
65LOCAL_CFLAGS += -Werror -Wall 65LOCAL_CFLAGS += -Werror -Wall
66LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected 66LOCAL_CPPFLAGS := -fvisibility=protected
67LOCAL_LDFLAGS := -ldl 67LOCAL_LDFLAGS := -ldl
68LOCAL_MULTILIB := both 68LOCAL_MULTILIB := both
69 69
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index b4a69bcfc..30531bcbd 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -24,7 +24,6 @@ cc_library {
24 "-Wall", 24 "-Wall",
25 ], 25 ],
26 cppflags: [ 26 cppflags: [
27 "-std=gnu++14",
28 "-fvisibility=hidden", 27 "-fvisibility=hidden",
29 ], 28 ],
30 export_include_dirs: ["include"], 29 export_include_dirs: ["include"],
diff --git a/libsync/Android.bp b/libsync/Android.bp
index 4948aa524..a4e55992c 100644
--- a/libsync/Android.bp
+++ b/libsync/Android.bp
@@ -34,7 +34,6 @@ cc_test {
34 "-g", 34 "-g",
35 "-Wall", 35 "-Wall",
36 "-Werror", 36 "-Werror",
37 "-std=gnu++11",
38 "-Wno-missing-field-initializers", 37 "-Wno-missing-field-initializers",
39 "-Wno-sign-compare", 38 "-Wno-sign-compare",
40 ], 39 ],
diff --git a/logcat/tests/Android.mk b/logcat/tests/Android.mk
index a28664e30..99c2e0a88 100644
--- a/logcat/tests/Android.mk
+++ b/logcat/tests/Android.mk
@@ -25,7 +25,6 @@ test_c_flags := \
25 -Wall -Wextra \ 25 -Wall -Wextra \
26 -Werror \ 26 -Werror \
27 -fno-builtin \ 27 -fno-builtin \
28 -std=gnu++11
29 28
30# ----------------------------------------------------------------------------- 29# -----------------------------------------------------------------------------
31# Benchmarks (actually a gTest where the result code does not matter) 30# Benchmarks (actually a gTest where the result code does not matter)
diff --git a/logwrapper/Android.bp b/logwrapper/Android.bp
index 41f072601..7ee04642a 100644
--- a/logwrapper/Android.bp
+++ b/logwrapper/Android.bp
@@ -14,7 +14,6 @@ cc_library {
14 local_include_dirs: ["include"], 14 local_include_dirs: ["include"],
15 cflags: [ 15 cflags: [
16 "-Werror", 16 "-Werror",
17 "-std=gnu99",
18 ], 17 ],
19} 18}
20 19
@@ -31,6 +30,5 @@ cc_binary {
31 ], 30 ],
32 cflags: [ 31 cflags: [
33 "-Werror", 32 "-Werror",
34 "-std=gnu99",
35 ], 33 ],
36} 34}
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index 4852fa4f8..5319ff4ab 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -42,7 +42,6 @@ LOCAL_SRC_FILES := \
42 42
43LOCAL_CFLAGS += $(common_cflags) 43LOCAL_CFLAGS += $(common_cflags)
44LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/ 44LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/
45LOCAL_CONLYFLAGS += -std=gnu99
46 45
47LOCAL_SHARED_LIBRARIES := \ 46LOCAL_SHARED_LIBRARIES := \
48 libcutils \ 47 libcutils \