Revert "Fix -Wl,--exclude-libs for clang runtime libraries"
This reverts commit 59de280a480cd7315de32adb7e4465a5480f7494.
Reason for revert: Broke mac tests
Bug: 235624976
Change-Id: I358bb14ec565f106483378f4798e3fc88c491f8f
diff --git a/cc/testing.go b/cc/testing.go
index 077fcda..ecdae8b 100644
--- a/cc/testing.go
+++ b/cc/testing.go
@@ -73,6 +73,7 @@
nocrt: true,
system_shared_libs: [],
stl: "none",
+ srcs: [""],
check_elf_files: false,
sanitize: {
never: true,
@@ -83,7 +84,6 @@
name: "libcompiler_rt-extras",
defaults: ["toolchain_libs_defaults"],
vendor_ramdisk_available: true,
- srcs: [""],
}
cc_prebuilt_library_static {
@@ -93,13 +93,11 @@
vendor_available: true,
vendor_ramdisk_available: true,
native_bridge_supported: true,
- srcs: [""],
}
cc_prebuilt_library_shared {
name: "libclang_rt.hwasan",
defaults: ["toolchain_libs_defaults"],
- srcs: [""],
}
cc_prebuilt_library_static {
@@ -110,7 +108,6 @@
],
vendor_ramdisk_available: true,
native_bridge_supported: true,
- srcs: [""],
}
cc_prebuilt_library_static {
@@ -119,34 +116,17 @@
"linux_bionic_supported",
"toolchain_libs_defaults",
],
- srcs: [""],
}
// Needed for sanitizer
cc_prebuilt_library_shared {
name: "libclang_rt.ubsan_standalone",
defaults: ["toolchain_libs_defaults"],
- srcs: [""],
}
cc_prebuilt_library_static {
name: "libclang_rt.ubsan_minimal",
defaults: ["toolchain_libs_defaults"],
- host_supported: true,
- target: {
- android_arm64: {
- srcs: ["libclang_rt.ubsan_minimal.android_arm64.a"],
- },
- android_arm: {
- srcs: ["libclang_rt.ubsan_minimal.android_arm.a"],
- },
- linux_glibc_x86_64: {
- srcs: ["libclang_rt.ubsan_minimal.x86_64.a"],
- },
- linux_glibc_x86: {
- srcs: ["libclang_rt.ubsan_minimal.x86.a"],
- },
- },
}
cc_library {
@@ -566,11 +546,6 @@
"defaults/cc/common/crtend_so.c": nil,
"defaults/cc/common/crtend.c": nil,
"defaults/cc/common/crtbrand.c": nil,
-
- "defaults/cc/common/libclang_rt.ubsan_minimal.android_arm64.a": nil,
- "defaults/cc/common/libclang_rt.ubsan_minimal.android_arm.a": nil,
- "defaults/cc/common/libclang_rt.ubsan_minimal.x86_64.a": nil,
- "defaults/cc/common/libclang_rt.ubsan_minimal.x86.a": nil,
}.AddToFixture(),
// Place the default cc test modules that are common to all platforms in a location that will not