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

Use single module for clang runtime libraries

Browse Source 
The clang prebuilts now provide a single module with per-architecture
variants instead of a module per architecture.

Bug: 220019988
Test: m checkbuild
Change-Id: I39e2cf8ae14edf8510276dab38011afaef85822c
Merged-In: I39e2cf8ae14edf8510276dab38011afaef85822c
This commit is contained in:
Colin Cross
2022-02-10 11:41:18 -08:00
parent 2d295a2de2
commit 4c4c1be915
11 changed files with 32 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
cc/testing.go
View File

@@ -86,53 +86,19 @@ func commonDefaultModules() string {
}
cc_prebuilt_library_static {
name: "libclang_rt.builtins-arm-android",
defaults: ["toolchain_libs_defaults"],
native_bridge_supported: true,
vendor_ramdisk_available: true,
}
cc_prebuilt_library_static {
name: "libclang_rt.builtins-aarch64-android",
defaults: ["toolchain_libs_defaults"],
native_bridge_supported: true,
vendor_ramdisk_available: true,
}
cc_prebuilt_library_static {
name: "libclang_rt.builtins-x86_64",
defaults: ["toolchain_libs_defaults"],
host_supported: true,
}
cc_prebuilt_library_static {
name: "libclang_rt.builtins-i386",
name: "libclang_rt.builtins",
defaults: ["toolchain_libs_defaults"],
host_supported: true,
vendor_available: true,
vendor_ramdisk_available: true,
native_bridge_supported: true,
}
cc_prebuilt_library_shared {
name: "libclang_rt.hwasan-aarch64-android",
name: "libclang_rt.hwasan",
defaults: ["toolchain_libs_defaults"],
}
cc_prebuilt_library_static {
name: "libclang_rt.builtins-i686-android",
defaults: ["toolchain_libs_defaults"],
vendor_ramdisk_available: true,
native_bridge_supported: true,
}
cc_prebuilt_library_static {
name: "libclang_rt.builtins-x86_64-android",
defaults: [
"linux_bionic_supported",
"toolchain_libs_defaults",
],
native_bridge_supported: true,
vendor_ramdisk_available: true,
}
cc_prebuilt_library_static {
name: "libunwind",
defaults: [
@@ -144,30 +110,7 @@ func commonDefaultModules() string {
}
cc_prebuilt_library_static {
name: "libclang_rt.fuzzer-arm-android",
defaults: ["toolchain_libs_defaults"],
}
cc_prebuilt_library_static {
name: "libclang_rt.fuzzer-aarch64-android",
defaults: ["toolchain_libs_defaults"],
}
cc_prebuilt_library_static {
name: "libclang_rt.fuzzer-i686-android",
defaults: ["toolchain_libs_defaults"],
}
cc_prebuilt_library_static {
name: "libclang_rt.fuzzer-x86_64-android",
defaults: [
"linux_bionic_supported",
"toolchain_libs_defaults",
],
}
cc_prebuilt_library_static {
name: "libclang_rt.fuzzer-x86_64",
name: "libclang_rt.fuzzer",
defaults: [
"linux_bionic_supported",
"toolchain_libs_defaults",
@@ -176,17 +119,12 @@ func commonDefaultModules() string {
// Needed for sanitizer
cc_prebuilt_library_shared {
name: "libclang_rt.ubsan_standalone-aarch64-android",
name: "libclang_rt.ubsan_standalone",
defaults: ["toolchain_libs_defaults"],
}
cc_prebuilt_library_static {
name: "libclang_rt.ubsan_minimal-aarch64-android",
defaults: ["toolchain_libs_defaults"],
}
cc_prebuilt_library_static {
name: "libclang_rt.ubsan_minimal-arm-android",
name: "libclang_rt.ubsan_minimal",
defaults: ["toolchain_libs_defaults"],
}