Merge "Rely on the platform -std default."
am: 955648a915
Change-Id: Ic4e9a7fbc7d13cc18ebb84801bf2f2f9a1d04470
diff --git a/adb/Android.mk b/adb/Android.mk
index 6ea0ab7..2a576e2 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -18,11 +18,9 @@
-DADB_REVISION='"$(adb_version)"' \
ADB_COMMON_linux_CFLAGS := \
- -std=c++14 \
-Wexit-time-destructors \
ADB_COMMON_darwin_CFLAGS := \
- -std=c++14 \
-Wexit-time-destructors \
# Define windows.h and tchar.h Unicode preprocessor symbols so that
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index fdedb76..1fc850f 100644
--- a/debuggerd/Android.mk
+++ b/debuggerd/Android.mk
@@ -1,7 +1,6 @@
LOCAL_PATH := $(call my-dir)
common_cppflags := \
- -std=gnu++11 \
-W \
-Wall \
-Wextra \
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index d69a81f..286de5b 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -37,7 +37,6 @@
LOCAL_MODULE := fastboot
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_HOST_OS := darwin linux windows
-LOCAL_CONLYFLAGS += -std=gnu99
LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code
LOCAL_CFLAGS += -DFASTBOOT_REVISION='"$(fastboot_version)"'
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 93d997b..85b5597 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -21,8 +21,6 @@
"-Wall",
"-Werror",
],
- conlyflags: ["-std=gnu99"],
- cppflags: ["-std=gnu++11"],
clang_cflags: ["-Wno-inline-asm"],
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 56a3970..bb17325 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -20,12 +20,6 @@
-Wall \
-Werror \
-libbacktrace_common_conlyflags := \
- -std=gnu99 \
-
-libbacktrace_common_cppflags := \
- -std=gnu++11 \
-
libbacktrace_common_c_includes := \
external/libunwind/include/tdep \
diff --git a/libcrypto_utils/Android.bp b/libcrypto_utils/Android.bp
index ca7bd31..f2560e6 100644
--- a/libcrypto_utils/Android.bp
+++ b/libcrypto_utils/Android.bp
@@ -24,7 +24,6 @@
"-Wall",
"-Wextra",
"-Werror",
- "-std=c99",
],
local_include_dirs: ["include"],
export_include_dirs: ["include"],
diff --git a/libcrypto_utils/tests/Android.mk b/libcrypto_utils/tests/Android.mk
index bdaef71..ef3d0cf 100644
--- a/libcrypto_utils/tests/Android.mk
+++ b/libcrypto_utils/tests/Android.mk
@@ -19,6 +19,6 @@
include $(CLEAR_VARS)
LOCAL_MODULE := libcrypto_utils_test
LOCAL_SRC_FILES := android_pubkey_test.cpp
-LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c++11
+LOCAL_CFLAGS := -Wall -Werror -Wextra
LOCAL_SHARED_LIBRARIES := libcrypto_utils libcrypto
include $(BUILD_HOST_NATIVE_TEST)
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 955c0ec..94275bd 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -89,10 +89,6 @@
static_libs: ["libdebuggerd_client"],
export_static_lib_headers: ["libdebuggerd_client"],
-
- cflags: [
- "-std=gnu90",
- ],
},
android_arm: {
diff --git a/liblog/tests/Android.mk b/liblog/tests/Android.mk
index a755b98..158987a 100644
--- a/liblog/tests/Android.mk
+++ b/liblog/tests/Android.mk
@@ -28,7 +28,6 @@
-Wall -Wextra \
-Werror \
-fno-builtin \
- -std=gnu++11
benchmark_src_files := \
benchmark_main.cpp \
@@ -54,7 +53,6 @@
-Wall -Wextra \
-Werror \
-fno-builtin \
- -std=gnu++11
test_src_files := \
liblog_test.cpp
diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp
index 85bc421..4662368 100644
--- a/libmemunreachable/Android.bp
+++ b/libmemunreachable/Android.bp
@@ -2,7 +2,6 @@
name: "libmemunreachable_defaults",
cflags: [
- "-std=c++14",
"-Wall",
"-Wextra",
"-Werror",
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index 598dfcd..5fb56f2 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -12,7 +12,6 @@
"-Wall",
],
cppflags: [
- "-std=gnu++11",
"-fvisibility=protected",
],
diff --git a/libnativebridge/tests/Android.mk b/libnativebridge/tests/Android.mk
index 7265939..5ad1569 100644
--- a/libnativebridge/tests/Android.mk
+++ b/libnativebridge/tests/Android.mk
@@ -31,7 +31,6 @@
$(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \
$(eval LOCAL_CLANG := true) \
- $(eval LOCAL_CPPFLAGS := -std=gnu++11) \
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
$(eval LOCAL_SRC_FILES := $(file)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
@@ -41,7 +40,6 @@
$(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \
$(eval LOCAL_CLANG := true) \
- $(eval LOCAL_CPPFLAGS := -std=gnu++11) \
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
$(eval LOCAL_SRC_FILES := $(file)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
diff --git a/libnativebridge/tests/Android.nativebridge-dummy.mk b/libnativebridge/tests/Android.nativebridge-dummy.mk
index 551765a..e556f80 100644
--- a/libnativebridge/tests/Android.nativebridge-dummy.mk
+++ b/libnativebridge/tests/Android.nativebridge-dummy.mk
@@ -12,7 +12,7 @@
LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Werror -Wall
-LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected
+LOCAL_CPPFLAGS := -fvisibility=protected
LOCAL_SHARED_LIBRARIES := libdl
LOCAL_MULTILIB := both
@@ -27,7 +27,7 @@
LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Werror -Wall
-LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected
+LOCAL_CPPFLAGS := -fvisibility=protected
LOCAL_LDFLAGS := -ldl
LOCAL_MULTILIB := both
@@ -48,7 +48,7 @@
LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Werror -Wall
-LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected
+LOCAL_CPPFLAGS := -fvisibility=protected
LOCAL_SHARED_LIBRARIES := libdl
LOCAL_MULTILIB := both
@@ -63,7 +63,7 @@
LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Werror -Wall
-LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected
+LOCAL_CPPFLAGS := -fvisibility=protected
LOCAL_LDFLAGS := -ldl
LOCAL_MULTILIB := both
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index b4a69bc..30531bc 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -24,7 +24,6 @@
"-Wall",
],
cppflags: [
- "-std=gnu++14",
"-fvisibility=hidden",
],
export_include_dirs: ["include"],
diff --git a/libsync/Android.bp b/libsync/Android.bp
index 4948aa5..a4e5599 100644
--- a/libsync/Android.bp
+++ b/libsync/Android.bp
@@ -34,7 +34,6 @@
"-g",
"-Wall",
"-Werror",
- "-std=gnu++11",
"-Wno-missing-field-initializers",
"-Wno-sign-compare",
],
diff --git a/logcat/tests/Android.mk b/logcat/tests/Android.mk
index a28664e..99c2e0a 100644
--- a/logcat/tests/Android.mk
+++ b/logcat/tests/Android.mk
@@ -25,7 +25,6 @@
-Wall -Wextra \
-Werror \
-fno-builtin \
- -std=gnu++11
# -----------------------------------------------------------------------------
# Benchmarks (actually a gTest where the result code does not matter)
diff --git a/logwrapper/Android.bp b/logwrapper/Android.bp
index 41f0726..7ee0464 100644
--- a/logwrapper/Android.bp
+++ b/logwrapper/Android.bp
@@ -14,7 +14,6 @@
local_include_dirs: ["include"],
cflags: [
"-Werror",
- "-std=gnu99",
],
}
@@ -31,6 +30,5 @@
],
cflags: [
"-Werror",
- "-std=gnu99",
],
}
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index 4852fa4..5319ff4 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -42,7 +42,6 @@
LOCAL_CFLAGS += $(common_cflags)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/
-LOCAL_CONLYFLAGS += -std=gnu99
LOCAL_SHARED_LIBRARIES := \
libcutils \