Merge "Rely on the platform -std default."
This commit is contained in:
commit
955648a915
18 changed files with 5 additions and 34 deletions
|
@ -18,11 +18,9 @@ ADB_COMMON_CFLAGS := \
|
|||
-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
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
common_cppflags := \
|
||||
-std=gnu++11 \
|
||||
-W \
|
||||
-Wall \
|
||||
-Wextra \
|
||||
|
|
|
@ -37,7 +37,6 @@ LOCAL_SRC_FILES := \
|
|||
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)"'
|
||||
|
|
|
@ -21,8 +21,6 @@ cc_defaults {
|
|||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
conlyflags: ["-std=gnu99"],
|
||||
cppflags: ["-std=gnu++11"],
|
||||
|
||||
clang_cflags: ["-Wno-inline-asm"],
|
||||
|
||||
|
|
|
@ -20,12 +20,6 @@ libbacktrace_common_cflags := \
|
|||
-Wall \
|
||||
-Werror \
|
||||
|
||||
libbacktrace_common_conlyflags := \
|
||||
-std=gnu99 \
|
||||
|
||||
libbacktrace_common_cppflags := \
|
||||
-std=gnu++11 \
|
||||
|
||||
libbacktrace_common_c_includes := \
|
||||
external/libunwind/include/tdep \
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@ cc_library {
|
|||
"-Wall",
|
||||
"-Wextra",
|
||||
"-Werror",
|
||||
"-std=c99",
|
||||
],
|
||||
local_include_dirs: ["include"],
|
||||
export_include_dirs: ["include"],
|
||||
|
|
|
@ -19,6 +19,6 @@ LOCAL_PATH := $(call my-dir)
|
|||
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)
|
||||
|
|
|
@ -89,10 +89,6 @@ cc_library {
|
|||
|
||||
static_libs: ["libdebuggerd_client"],
|
||||
export_static_lib_headers: ["libdebuggerd_client"],
|
||||
|
||||
cflags: [
|
||||
"-std=gnu90",
|
||||
],
|
||||
},
|
||||
|
||||
android_arm: {
|
||||
|
|
|
@ -28,7 +28,6 @@ benchmark_c_flags := \
|
|||
-Wall -Wextra \
|
||||
-Werror \
|
||||
-fno-builtin \
|
||||
-std=gnu++11
|
||||
|
||||
benchmark_src_files := \
|
||||
benchmark_main.cpp \
|
||||
|
@ -54,7 +53,6 @@ test_c_flags := \
|
|||
-Wall -Wextra \
|
||||
-Werror \
|
||||
-fno-builtin \
|
||||
-std=gnu++11
|
||||
|
||||
test_src_files := \
|
||||
liblog_test.cpp
|
||||
|
|
|
@ -2,7 +2,6 @@ cc_defaults {
|
|||
name: "libmemunreachable_defaults",
|
||||
|
||||
cflags: [
|
||||
"-std=c++14",
|
||||
"-Wall",
|
||||
"-Wextra",
|
||||
"-Werror",
|
||||
|
|
|
@ -12,7 +12,6 @@ cc_library {
|
|||
"-Wall",
|
||||
],
|
||||
cppflags: [
|
||||
"-std=gnu++11",
|
||||
"-fvisibility=protected",
|
||||
],
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ shared_libraries := \
|
|||
$(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), \
|
|||
$(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=%))) \
|
||||
|
|
|
@ -12,7 +12,7 @@ LOCAL_MODULE:= libnativebridge-dummy
|
|||
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_MODULE:= libnativebridge-dummy
|
|||
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_MODULE:= libnativebridge2-dummy
|
|||
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_MODULE:= libnativebridge2-dummy
|
|||
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
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@ cc_library {
|
|||
"-Wall",
|
||||
],
|
||||
cppflags: [
|
||||
"-std=gnu++14",
|
||||
"-fvisibility=hidden",
|
||||
],
|
||||
export_include_dirs: ["include"],
|
||||
|
|
|
@ -34,7 +34,6 @@ cc_test {
|
|||
"-g",
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
"-std=gnu++11",
|
||||
"-Wno-missing-field-initializers",
|
||||
"-Wno-sign-compare",
|
||||
],
|
||||
|
|
|
@ -25,7 +25,6 @@ test_c_flags := \
|
|||
-Wall -Wextra \
|
||||
-Werror \
|
||||
-fno-builtin \
|
||||
-std=gnu++11
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Benchmarks (actually a gTest where the result code does not matter)
|
||||
|
|
|
@ -14,7 +14,6 @@ cc_library {
|
|||
local_include_dirs: ["include"],
|
||||
cflags: [
|
||||
"-Werror",
|
||||
"-std=gnu99",
|
||||
],
|
||||
}
|
||||
|
||||
|
@ -31,6 +30,5 @@ cc_binary {
|
|||
],
|
||||
cflags: [
|
||||
"-Werror",
|
||||
"-std=gnu99",
|
||||
],
|
||||
}
|
||||
|
|
|
@ -42,7 +42,6 @@ LOCAL_SRC_FILES := \
|
|||
|
||||
LOCAL_CFLAGS += $(common_cflags)
|
||||
LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-netbsd/include/
|
||||
LOCAL_CONLYFLAGS += -std=gnu99
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libcutils \
|
||||
|
|
Loading…
Reference in a new issue