summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--adb/Android.mk5
-rw-r--r--base/Android.bp2
-rw-r--r--bootstat/Android.bp3
-rw-r--r--fs_mgr/Android.mk1
-rw-r--r--init/Android.mk1
-rw-r--r--libappfuse/Android.bp1
-rw-r--r--libcutils/Android.bp2
-rw-r--r--libion/tests/Android.bp1
-rw-r--r--libmemunreachable/Android.bp1
-rw-r--r--libmetricslogger/Android.bp1
-rw-r--r--libnativebridge/Android.bp1
-rw-r--r--libnativebridge/tests/Android.mk2
-rw-r--r--libnativeloader/Android.bp1
-rw-r--r--libpackagelistparser/Android.bp1
-rw-r--r--libsync/Android.bp1
-rw-r--r--libutils/Android.bp2
-rw-r--r--sdcard/Android.mk1
17 files changed, 0 insertions, 27 deletions
diff --git a/adb/Android.mk b/adb/Android.mk
index ae03593ed..e195bec6a 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -108,7 +108,6 @@ LIBADB_TEST_windows_SRCS := \
108 sysdeps_win32_test.cpp \ 108 sysdeps_win32_test.cpp \
109 109
110include $(CLEAR_VARS) 110include $(CLEAR_VARS)
111LOCAL_CLANG := true
112LOCAL_MODULE := libadbd_usb 111LOCAL_MODULE := libadbd_usb
113LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0 112LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0
114LOCAL_SRC_FILES := daemon/usb.cpp 113LOCAL_SRC_FILES := daemon/usb.cpp
@@ -122,7 +121,6 @@ LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase
122include $(BUILD_STATIC_LIBRARY) 121include $(BUILD_STATIC_LIBRARY)
123 122
124include $(CLEAR_VARS) 123include $(CLEAR_VARS)
125LOCAL_CLANG := true
126LOCAL_MODULE := libadbd 124LOCAL_MODULE := libadbd
127LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0 125LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0
128LOCAL_SRC_FILES := \ 126LOCAL_SRC_FILES := \
@@ -171,7 +169,6 @@ LOCAL_MULTILIB := first
171include $(BUILD_HOST_STATIC_LIBRARY) 169include $(BUILD_HOST_STATIC_LIBRARY)
172 170
173include $(CLEAR_VARS) 171include $(CLEAR_VARS)
174LOCAL_CLANG := true
175LOCAL_MODULE := adbd_test 172LOCAL_MODULE := adbd_test
176LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS) 173LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS)
177LOCAL_SRC_FILES := \ 174LOCAL_SRC_FILES := \
@@ -330,8 +327,6 @@ endif
330 327
331include $(CLEAR_VARS) 328include $(CLEAR_VARS)
332 329
333LOCAL_CLANG := true
334
335LOCAL_SRC_FILES := \ 330LOCAL_SRC_FILES := \
336 daemon/main.cpp \ 331 daemon/main.cpp \
337 daemon/mdns.cpp \ 332 daemon/mdns.cpp \
diff --git a/base/Android.bp b/base/Android.bp
index b636dc31c..13957560f 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -39,7 +39,6 @@ cc_library_headers {
39cc_library { 39cc_library {
40 name: "libbase", 40 name: "libbase",
41 vendor_available: true, 41 vendor_available: true,
42 clang: true,
43 host_supported: true, 42 host_supported: true,
44 srcs: [ 43 srcs: [
45 "file.cpp", 44 "file.cpp",
@@ -109,7 +108,6 @@ cc_library {
109cc_test { 108cc_test {
110 name: "libbase_test", 109 name: "libbase_test",
111 host_supported: true, 110 host_supported: true,
112 clang: true,
113 srcs: [ 111 srcs: [
114 "endian_test.cpp", 112 "endian_test.cpp",
115 "errors_test.cpp", 113 "errors_test.cpp",
diff --git a/bootstat/Android.bp b/bootstat/Android.bp
index bc90a6e6a..dd357edd7 100644
--- a/bootstat/Android.bp
+++ b/bootstat/Android.bp
@@ -32,9 +32,6 @@ cc_defaults {
32 "liblog", 32 "liblog",
33 "libmetricslogger", 33 "libmetricslogger",
34 ], 34 ],
35 whole_static_libs: ["libgtest_prod"],
36 // Clang is required because of C++14
37 clang: true,
38} 35}
39 36
40// bootstat static library 37// bootstat static library
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk
index f3ca7246f..18ccc436c 100644
--- a/fs_mgr/Android.mk
+++ b/fs_mgr/Android.mk
@@ -15,7 +15,6 @@ common_static_libraries := \
15 libavb 15 libavb
16 16
17include $(CLEAR_VARS) 17include $(CLEAR_VARS)
18LOCAL_CLANG := true
19LOCAL_SANITIZE := integer 18LOCAL_SANITIZE := integer
20LOCAL_SRC_FILES:= fs_mgr_main.cpp 19LOCAL_SRC_FILES:= fs_mgr_main.cpp
21LOCAL_C_INCLUDES := $(LOCAL_PATH)/include 20LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
diff --git a/init/Android.mk b/init/Android.mk
index 670edc049..eada50b03 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -99,5 +99,4 @@ LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \
99 ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd 99 ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
100 100
101LOCAL_SANITIZE := integer 101LOCAL_SANITIZE := integer
102LOCAL_CLANG := true
103include $(BUILD_EXECUTABLE) 102include $(BUILD_EXECUTABLE)
diff --git a/libappfuse/Android.bp b/libappfuse/Android.bp
index e659f79fc..bfe5aaf97 100644
--- a/libappfuse/Android.bp
+++ b/libappfuse/Android.bp
@@ -8,7 +8,6 @@ cc_defaults {
8 "-Wall", 8 "-Wall",
9 "-Werror", 9 "-Werror",
10 ], 10 ],
11 clang: true
12} 11}
13 12
14cc_library_shared { 13cc_library_shared {
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 245deb113..85258cdda 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -156,8 +156,6 @@ cc_library {
156 "-Wall", 156 "-Wall",
157 "-Wextra", 157 "-Wextra",
158 ], 158 ],
159
160 clang: true,
161} 159}
162 160
163subdirs = ["tests"] 161subdirs = ["tests"]
diff --git a/libion/tests/Android.bp b/libion/tests/Android.bp
index 4428848e1..b3fcb3b61 100644
--- a/libion/tests/Android.bp
+++ b/libion/tests/Android.bp
@@ -16,7 +16,6 @@
16 16
17cc_test { 17cc_test {
18 name: "ion-unit-tests", 18 name: "ion-unit-tests",
19 clang: true,
20 cflags: [ 19 cflags: [
21 "-g", 20 "-g",
22 "-Wall", 21 "-Wall",
diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp
index 826a576e6..8b76a6513 100644
--- a/libmemunreachable/Android.bp
+++ b/libmemunreachable/Android.bp
@@ -6,7 +6,6 @@ cc_defaults {
6 "-Wextra", 6 "-Wextra",
7 "-Werror", 7 "-Werror",
8 ], 8 ],
9 clang: true,
10 shared_libs: [ 9 shared_libs: [
11 "libbase", 10 "libbase",
12 ], 11 ],
diff --git a/libmetricslogger/Android.bp b/libmetricslogger/Android.bp
index 26a041abd..c692d1fa3 100644
--- a/libmetricslogger/Android.bp
+++ b/libmetricslogger/Android.bp
@@ -7,7 +7,6 @@ metricslogger_lib_src_files = [
7cc_defaults { 7cc_defaults {
8 name: "metricslogger_defaults", 8 name: "metricslogger_defaults",
9 9
10 clang: true,
11 host_supported: true, 10 host_supported: true,
12 11
13 export_include_dirs: ["include"], 12 export_include_dirs: ["include"],
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index 1cea4cd39..8b48a87e9 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -12,7 +12,6 @@ cc_library {
12 host_supported: true, 12 host_supported: true,
13 srcs: ["native_bridge.cc"], 13 srcs: ["native_bridge.cc"],
14 shared_libs: ["liblog"], 14 shared_libs: ["liblog"],
15 clang: true,
16 15
17 export_include_dirs=["include"], 16 export_include_dirs=["include"],
18 17
diff --git a/libnativebridge/tests/Android.mk b/libnativebridge/tests/Android.mk
index 70b3fcc6d..c1e65ff98 100644
--- a/libnativebridge/tests/Android.mk
+++ b/libnativebridge/tests/Android.mk
@@ -34,7 +34,6 @@ shared_libraries := \
34 34
35$(foreach file,$(test_src_files), \ 35$(foreach file,$(test_src_files), \
36 $(eval include $(CLEAR_VARS)) \ 36 $(eval include $(CLEAR_VARS)) \
37 $(eval LOCAL_CLANG := true) \
38 $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ 37 $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
39 $(eval LOCAL_SRC_FILES := $(file)) \ 38 $(eval LOCAL_SRC_FILES := $(file)) \
40 $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ 39 $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
@@ -43,7 +42,6 @@ $(foreach file,$(test_src_files), \
43 42
44$(foreach file,$(test_src_files), \ 43$(foreach file,$(test_src_files), \
45 $(eval include $(CLEAR_VARS)) \ 44 $(eval include $(CLEAR_VARS)) \
46 $(eval LOCAL_CLANG := true) \
47 $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ 45 $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
48 $(eval LOCAL_SRC_FILES := $(file)) \ 46 $(eval LOCAL_SRC_FILES := $(file)) \
49 $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ 47 $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index c1133fbc1..13f974424 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -19,7 +19,6 @@ cc_library {
19 host_ldlibs: ["-ldl"], 19 host_ldlibs: ["-ldl"],
20 }, 20 },
21 }, 21 },
22 clang: true,
23 cflags: [ 22 cflags: [
24 "-Werror", 23 "-Werror",
25 "-Wall", 24 "-Wall",
diff --git a/libpackagelistparser/Android.bp b/libpackagelistparser/Android.bp
index 70ff52897..a9fec7df3 100644
--- a/libpackagelistparser/Android.bp
+++ b/libpackagelistparser/Android.bp
@@ -6,7 +6,6 @@ cc_library {
6 local_include_dirs: ["include"], 6 local_include_dirs: ["include"],
7 export_include_dirs: ["include"], 7 export_include_dirs: ["include"],
8 8
9 clang: true,
10 sanitize: { 9 sanitize: {
11 misc_undefined: ["integer"], 10 misc_undefined: ["integer"],
12 }, 11 },
diff --git a/libsync/Android.bp b/libsync/Android.bp
index 4bafb0854..4f71b9fd6 100644
--- a/libsync/Android.bp
+++ b/libsync/Android.bp
@@ -38,5 +38,4 @@ cc_test {
38 "-Wno-missing-field-initializers", 38 "-Wno-missing-field-initializers",
39 "-Wno-sign-compare", 39 "-Wno-sign-compare",
40 ], 40 ],
41 clang: true,
42} 41}
diff --git a/libutils/Android.bp b/libutils/Android.bp
index fbfb7c2a8..109ac3326 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -142,8 +142,6 @@ cc_library {
142 enabled: true, 142 enabled: true,
143 }, 143 },
144 }, 144 },
145
146 clang: true,
147} 145}
148 146
149// Include subdirectory makefiles 147// Include subdirectory makefiles
diff --git a/sdcard/Android.mk b/sdcard/Android.mk
index 0c5857462..5b4dc5841 100644
--- a/sdcard/Android.mk
+++ b/sdcard/Android.mk
@@ -8,6 +8,5 @@ LOCAL_CFLAGS := -Wall -Wno-unused-parameter -Werror
8LOCAL_SHARED_LIBRARIES := libbase libcutils libminijail libpackagelistparser 8LOCAL_SHARED_LIBRARIES := libbase libcutils libminijail libpackagelistparser
9 9
10LOCAL_SANITIZE := integer 10LOCAL_SANITIZE := integer
11LOCAL_CLANG := true
12 11
13include $(BUILD_EXECUTABLE) 12include $(BUILD_EXECUTABLE)