Merge "Remove clang: true"
diff --git a/Android.bp b/Android.bp
index 8518676..6c03e4b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,7 +23,6 @@
name: "libcompiler_rt-extras",
host_supported: true,
vendor_available: true,
- clang: true,
sdk_version: "9",
// The following list contains functions that are not available in libgcc.a, so
// we potentially need them when using a Clang-built component (e.g., -ftrapv
@@ -408,7 +407,6 @@
},
asflags: ["-integrated-as"],
- clang: true,
no_libgcc: true,
sanitize: {
diff --git a/lib/asan/Android.bp b/lib/asan/Android.bp
index eb9e32e..047ba8c 100644
--- a/lib/asan/Android.bp
+++ b/lib/asan/Android.bp
@@ -84,7 +84,6 @@
},
},
- clang: true,
sdk_version: "19",
stl: "none",
@@ -102,7 +101,6 @@
cflags: asan_rtl_cflags,
srcs: asan_rtl_cxx_files,
- clang: true,
compile_multilib: "both",
sanitize: {
@@ -145,7 +143,6 @@
"liblog",
"libdl",
],
- clang: true,
sanitize: {
never: true,
},
@@ -252,7 +249,6 @@
static_libs: ["libgtest"],
- clang: true,
sanitize: {
never: true,
},
@@ -296,7 +292,6 @@
address: true,
blacklist: "tests/asan_test.ignore",
},
- clang: true,
stl: "libc++",
target: {
diff --git a/lib/interception/Android.bp b/lib/interception/Android.bp
index 479ea67..939bc24 100644
--- a/lib/interception/Android.bp
+++ b/lib/interception/Android.bp
@@ -18,7 +18,6 @@
cc_library_static {
name: "libinterception",
host_supported: true,
- clang: true,
sdk_version: "19",
include_dirs: ["external/compiler-rt/lib"],
diff --git a/lib/lsan/Android.bp b/lib/lsan/Android.bp
index 97f55c3..6fe75d4 100644
--- a/lib/lsan/Android.bp
+++ b/lib/lsan/Android.bp
@@ -39,7 +39,6 @@
"lsan_common_linux.cc",
],
- clang: true,
sdk_version: "19",
stl: "none",
diff --git a/lib/profile/Android.bp b/lib/profile/Android.bp
index a0059e5..de76de9 100644
--- a/lib/profile/Android.bp
+++ b/lib/profile/Android.bp
@@ -27,7 +27,6 @@
"-Werror",
"-Wall",
],
- clang: true,
srcs: [
"GCDAProfiling.c",
"InstrProfiling.c",
diff --git a/lib/sanitizer_common/Android.bp b/lib/sanitizer_common/Android.bp
index 687e3f8..de8cf61 100644
--- a/lib/sanitizer_common/Android.bp
+++ b/lib/sanitizer_common/Android.bp
@@ -21,7 +21,6 @@
cc_library_static {
name: "libsan",
host_supported: true,
- clang: true,
sdk_version: "19",
include_dirs: ["external/compiler-rt/lib"],
diff --git a/lib/ubsan/Android.bp b/lib/ubsan/Android.bp
index ab332e0..4638ab3 100644
--- a/lib/ubsan/Android.bp
+++ b/lib/ubsan/Android.bp
@@ -96,7 +96,6 @@
"liblog",
"libdl",
],
- clang: true,
sanitize: {
never: true,
},
