Merge "Remove LOCAL_CLANG and clang: true"
am: 80ec81cf4b
Change-Id: Ia7f79d8e25ee9870fe44d198568d0e5dabdff811
This commit is contained in:
commit
f7b315c985
17 changed files with 0 additions and 27 deletions
|
@ -108,7 +108,6 @@ LIBADB_TEST_windows_SRCS := \
|
|||
sysdeps_win32_test.cpp \
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_CLANG := true
|
||||
LOCAL_MODULE := libadbd_usb
|
||||
LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0
|
||||
LOCAL_SRC_FILES := daemon/usb.cpp
|
||||
|
@ -122,7 +121,6 @@ LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase
|
|||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_CLANG := true
|
||||
LOCAL_MODULE := libadbd
|
||||
LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0
|
||||
LOCAL_SRC_FILES := \
|
||||
|
@ -171,7 +169,6 @@ LOCAL_MULTILIB := first
|
|||
include $(BUILD_HOST_STATIC_LIBRARY)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_CLANG := true
|
||||
LOCAL_MODULE := adbd_test
|
||||
LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS)
|
||||
LOCAL_SRC_FILES := \
|
||||
|
@ -330,8 +327,6 @@ endif
|
|||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_CLANG := true
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
daemon/main.cpp \
|
||||
daemon/mdns.cpp \
|
||||
|
|
|
@ -39,7 +39,6 @@ cc_library_headers {
|
|||
cc_library {
|
||||
name: "libbase",
|
||||
vendor_available: true,
|
||||
clang: true,
|
||||
host_supported: true,
|
||||
srcs: [
|
||||
"file.cpp",
|
||||
|
@ -109,7 +108,6 @@ cc_library {
|
|||
cc_test {
|
||||
name: "libbase_test",
|
||||
host_supported: true,
|
||||
clang: true,
|
||||
srcs: [
|
||||
"endian_test.cpp",
|
||||
"errors_test.cpp",
|
||||
|
|
|
@ -32,9 +32,6 @@ cc_defaults {
|
|||
"liblog",
|
||||
"libmetricslogger",
|
||||
],
|
||||
whole_static_libs: ["libgtest_prod"],
|
||||
// Clang is required because of C++14
|
||||
clang: true,
|
||||
}
|
||||
|
||||
// bootstat static library
|
||||
|
|
|
@ -15,7 +15,6 @@ common_static_libraries := \
|
|||
libavb
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_CLANG := true
|
||||
LOCAL_SANITIZE := integer
|
||||
LOCAL_SRC_FILES:= fs_mgr_main.cpp
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
|
||||
|
|
|
@ -100,5 +100,4 @@ LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \
|
|||
ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
|
||||
|
||||
LOCAL_SANITIZE := integer
|
||||
LOCAL_CLANG := true
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
|
|
@ -8,7 +8,6 @@ cc_defaults {
|
|||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
clang: true
|
||||
}
|
||||
|
||||
cc_library_shared {
|
||||
|
|
|
@ -156,8 +156,6 @@ cc_library {
|
|||
"-Wall",
|
||||
"-Wextra",
|
||||
],
|
||||
|
||||
clang: true,
|
||||
}
|
||||
|
||||
subdirs = ["tests"]
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
|
||||
cc_test {
|
||||
name: "ion-unit-tests",
|
||||
clang: true,
|
||||
cflags: [
|
||||
"-g",
|
||||
"-Wall",
|
||||
|
|
|
@ -6,7 +6,6 @@ cc_defaults {
|
|||
"-Wextra",
|
||||
"-Werror",
|
||||
],
|
||||
clang: true,
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
],
|
||||
|
|
|
@ -7,7 +7,6 @@ metricslogger_lib_src_files = [
|
|||
cc_defaults {
|
||||
name: "metricslogger_defaults",
|
||||
|
||||
clang: true,
|
||||
host_supported: true,
|
||||
|
||||
export_include_dirs: ["include"],
|
||||
|
|
|
@ -12,7 +12,6 @@ cc_library {
|
|||
host_supported: true,
|
||||
srcs: ["native_bridge.cc"],
|
||||
shared_libs: ["liblog"],
|
||||
clang: true,
|
||||
|
||||
export_include_dirs=["include"],
|
||||
|
||||
|
|
|
@ -34,7 +34,6 @@ shared_libraries := \
|
|||
|
||||
$(foreach file,$(test_src_files), \
|
||||
$(eval include $(CLEAR_VARS)) \
|
||||
$(eval LOCAL_CLANG := true) \
|
||||
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
|
||||
$(eval LOCAL_SRC_FILES := $(file)) \
|
||||
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
|
||||
|
@ -43,7 +42,6 @@ $(foreach file,$(test_src_files), \
|
|||
|
||||
$(foreach file,$(test_src_files), \
|
||||
$(eval include $(CLEAR_VARS)) \
|
||||
$(eval LOCAL_CLANG := true) \
|
||||
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
|
||||
$(eval LOCAL_SRC_FILES := $(file)) \
|
||||
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
|
||||
|
|
|
@ -19,7 +19,6 @@ cc_library {
|
|||
host_ldlibs: ["-ldl"],
|
||||
},
|
||||
},
|
||||
clang: true,
|
||||
cflags: [
|
||||
"-Werror",
|
||||
"-Wall",
|
||||
|
|
|
@ -6,7 +6,6 @@ cc_library {
|
|||
local_include_dirs: ["include"],
|
||||
export_include_dirs: ["include"],
|
||||
|
||||
clang: true,
|
||||
sanitize: {
|
||||
misc_undefined: ["integer"],
|
||||
},
|
||||
|
|
|
@ -52,5 +52,4 @@ cc_test {
|
|||
"-Wno-missing-field-initializers",
|
||||
"-Wno-sign-compare",
|
||||
],
|
||||
clang: true,
|
||||
}
|
||||
|
|
|
@ -140,8 +140,6 @@ cc_library {
|
|||
enabled: true,
|
||||
},
|
||||
},
|
||||
|
||||
clang: true,
|
||||
}
|
||||
|
||||
// Include subdirectory makefiles
|
||||
|
|
|
@ -8,6 +8,5 @@ LOCAL_CFLAGS := -Wall -Wno-unused-parameter -Werror
|
|||
LOCAL_SHARED_LIBRARIES := libbase libcutils libminijail libpackagelistparser
|
||||
|
||||
LOCAL_SANITIZE := integer
|
||||
LOCAL_CLANG := true
|
||||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
|
Loading…
Reference in a new issue