StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix -Wl,--exclude-libs for clang runtime libraries"

Browse Source 
This reverts commit 59de280a48.

Reason for revert: Broke mac tests
Bug: 235624976

Change-Id: I358bb14ec565f106483378f4798e3fc88c491f8f
This commit is contained in:
Colin Cross
2022-06-17 22:15:00 +00:00
parent 59de280a48
commit 567d98346c
5 changed files with 16 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cc/testing.go
View File

@@ -73,6 +73,7 @@ func commonDefaultModules() string {
nocrt: true,
system_shared_libs: [],
stl: "none",
srcs: [""],
check_elf_files: false,
sanitize: {
never: true,
@@ -83,7 +84,6 @@ func commonDefaultModules() string {
name: "libcompiler_rt-extras",
defaults: ["toolchain_libs_defaults"],
vendor_ramdisk_available: true,
srcs: [""],
}
cc_prebuilt_library_static {
@@ -93,13 +93,11 @@ func commonDefaultModules() string {
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 @@ func commonDefaultModules() string {
],
vendor_ramdisk_available: true,
native_bridge_supported: true,
srcs: [""],
}
cc_prebuilt_library_static {
@@ -119,34 +116,17 @@ func commonDefaultModules() string {
"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 @@ var PrepareForTestWithCcDefaultModules = android.GroupFixturePreparers(
"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