ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove LOCAL_CLANG and clang: true" am: 80ec81cf4b am: f7b315c985

Browse source 
am: 8a8b97b271

Change-Id: I7e691abe2e2ccec5d9477c528d603c081c0a5661
This commit is contained in:
Lennart Wieboldt 2017-07-25 22:35:56 +00:00 • committed by android-build-merger
commit e1332dd01b
17 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/Android.mk
View file

@ -108,7 +108,6 @@ LIBADB_TEST_windows_SRCS := \
sysdeps_win32_test.cpp \ sysdeps_win32_test.cpp \
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := libadbd_usb LOCAL_MODULE := libadbd_usb
LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0 LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0
LOCAL_SRC_FILES := daemon/usb.cpp LOCAL_SRC_FILES := daemon/usb.cpp
@ -122,7 +121,6 @@ LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := libadbd LOCAL_MODULE := libadbd
LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0 LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@ -171,7 +169,6 @@ LOCAL_MULTILIB := first
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := adbd_test LOCAL_MODULE := adbd_test
LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS) LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@ -330,8 +327,6 @@ endif
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
daemon/main.cpp \ daemon/main.cpp \
daemon/mdns.cpp \ daemon/mdns.cpp \

2
base/Android.bp
View file

@ -39,7 +39,6 @@ cc_library_headers {
cc_library { cc_library {
name: "libbase", name: "libbase",
vendor_available: true, vendor_available: true,
clang: true,
host_supported: true, host_supported: true,
srcs: [ srcs: [
"file.cpp", "file.cpp",
@ -109,7 +108,6 @@ cc_library {
cc_test { cc_test {
name: "libbase_test", name: "libbase_test",
host_supported: true, host_supported: true,
clang: true,
srcs: [ srcs: [
"endian_test.cpp", "endian_test.cpp",
"errors_test.cpp", "errors_test.cpp",

3
bootstat/Android.bp
View file

@ -32,9 +32,6 @@ cc_defaults {
"liblog", "liblog",
"libmetricslogger", "libmetricslogger",
], ],
whole_static_libs: ["libgtest_prod"],
// Clang is required because of C++14
clang: true,
} }
// bootstat static library // bootstat static library

1
fs_mgr/Android.mk
View file

@ -15,7 +15,6 @@ common_static_libraries := \
libavb libavb
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_SANITIZE := integer LOCAL_SANITIZE := integer
LOCAL_SRC_FILES:= fs_mgr_main.cpp LOCAL_SRC_FILES:= fs_mgr_main.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

1
init/Android.mk
View file

@ -98,5 +98,4 @@ LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \
ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
LOCAL_SANITIZE := integer LOCAL_SANITIZE := integer
LOCAL_CLANG := true
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

1
libappfuse/Android.bp
View file

@ -8,7 +8,6 @@ cc_defaults {
"-Wall", "-Wall",
"-Werror", "-Werror",
], ],
clang: true
} }
cc_library_shared { cc_library_shared {

2
libcutils/Android.bp
View file

@ -156,8 +156,6 @@ cc_library {
"-Wall", "-Wall",
"-Wextra", "-Wextra",
], ],
clang: true,
} }
subdirs = ["tests"] subdirs = ["tests"]

1
libion/tests/Android.bp
View file

@ -16,7 +16,6 @@
cc_test { cc_test {
name: "ion-unit-tests", name: "ion-unit-tests",
clang: true,
cflags: [ cflags: [
"-g", "-g",
"-Wall", "-Wall",

1
libmemunreachable/Android.bp
View file

@ -6,7 +6,6 @@ cc_defaults {
"-Wextra", "-Wextra",
"-Werror", "-Werror",
], ],
clang: true,
shared_libs: [ shared_libs: [
"libbase", "libbase",
], ],

1
libmetricslogger/Android.bp
View file

@ -7,7 +7,6 @@ metricslogger_lib_src_files = [
cc_defaults { cc_defaults {
name: "metricslogger_defaults", name: "metricslogger_defaults",
clang: true,
host_supported: true, host_supported: true,
export_include_dirs: ["include"], export_include_dirs: ["include"],

1
libnativebridge/Android.bp
View file

@ -12,7 +12,6 @@ cc_library {
host_supported: true, host_supported: true,
srcs: ["native_bridge.cc"], srcs: ["native_bridge.cc"],
shared_libs: ["liblog"], shared_libs: ["liblog"],
clang: true,
export_include_dirs=["include"], export_include_dirs=["include"],

2
libnativebridge/tests/Android.mk
View file

@ -34,7 +34,6 @@ shared_libraries := \
$(foreach file,$(test_src_files), \ $(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \ $(eval include $(CLEAR_VARS)) \
$(eval LOCAL_CLANG := true) \
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
$(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_SRC_FILES := $(file)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
@ -43,7 +42,6 @@ $(foreach file,$(test_src_files), \
$(foreach file,$(test_src_files), \ $(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \ $(eval include $(CLEAR_VARS)) \
$(eval LOCAL_CLANG := true) \
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
$(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_SRC_FILES := $(file)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \

1
libnativeloader/Android.bp
View file

@ -19,7 +19,6 @@ cc_library {
host_ldlibs: ["-ldl"], host_ldlibs: ["-ldl"],
}, },
}, },
clang: true,
cflags: [ cflags: [
"-Werror", "-Werror",
"-Wall", "-Wall",

1
libpackagelistparser/Android.bp
View file

@ -6,7 +6,6 @@ cc_library {
local_include_dirs: ["include"], local_include_dirs: ["include"],
export_include_dirs: ["include"], export_include_dirs: ["include"],
clang: true,
sanitize: { sanitize: {
misc_undefined: ["integer"], misc_undefined: ["integer"],
}, },

1
libsync/Android.bp
View file

@ -52,5 +52,4 @@ cc_test {
"-Wno-missing-field-initializers", "-Wno-missing-field-initializers",
"-Wno-sign-compare", "-Wno-sign-compare",
], ],
clang: true,
} }

2
libutils/Android.bp
View file

@ -140,8 +140,6 @@ cc_library {
enabled: true, enabled: true,
}, },
}, },
clang: true,
} }
// Include subdirectory makefiles // Include subdirectory makefiles

1
sdcard/Android.mk
View file

@ -8,6 +8,5 @@ LOCAL_CFLAGS := -Wall -Wno-unused-parameter -Werror
LOCAL_SHARED_LIBRARIES := libbase libcutils libminijail libpackagelistparser LOCAL_SHARED_LIBRARIES := libbase libcutils libminijail libpackagelistparser
LOCAL_SANITIZE := integer LOCAL_SANITIZE := integer
LOCAL_CLANG := true
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)