Add builtins and minimal runtime as dependencies instead of flags

Use dependencies instead of libflags to link libclang_rt.builtins
and libclang_rt.ubsan_minimal.

Test: m checkbuild
Change-Id: I403cee0fb8cc21c347b42d8f8a3c20d6f43337a4
This commit is contained in:
Colin Cross
2022-02-10 10:34:19 -08:00
parent 72ee67659d
commit 06c80eb851
3 changed files with 60 additions and 29 deletions

View File

@@ -99,6 +99,18 @@ func commonDefaultModules() string {
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",
defaults: ["toolchain_libs_defaults"],
host_supported: true,
}
cc_prebuilt_library_shared {
name: "libclang_rt.hwasan-aarch64-android",
defaults: ["toolchain_libs_defaults"],
@@ -168,6 +180,16 @@ func commonDefaultModules() string {
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",
defaults: ["toolchain_libs_defaults"],
}
cc_library {
name: "libc",
defaults: ["linux_bionic_supported"],