Fix adding manual ubsan runtime to static glibc binaries
Sanitized glibc binaries get their runtime added by clang, not by
Soong, but unsanitized glibc binaries with sanitized dependencies
need their runtime added manually by Soong. Fix adding a static
runtime dependency to static glibc binaries.
Fixes: 297250415
Test: TestUbsan
Change-Id: I4913326604f9efebd8ecd4aad2f109fad8b6a80c
diff --git a/cc/sanitize_test.go b/cc/sanitize_test.go
index 29b17d4..49117a0 100644
--- a/cc/sanitize_test.go
+++ b/cc/sanitize_test.go
@@ -714,6 +714,15 @@
],
}
+ cc_binary {
+ name: "static_bin_with_ubsan_dep",
+ static_executable: true,
+ host_supported: true,
+ static_libs: [
+ "libubsan_diag",
+ ],
+ }
+
cc_library_shared {
name: "libshared",
host_supported: true,
@@ -742,6 +751,17 @@
}
cc_library_static {
+ name: "libubsan_diag",
+ host_supported: true,
+ sanitize: {
+ undefined: true,
+ diag: {
+ undefined: true,
+ },
+ },
+ }
+
+ cc_library_static {
name: "libstatic",
host_supported: true,
}
@@ -763,6 +783,7 @@
sharedVariant := variant + "_shared"
minimalRuntime := result.ModuleForTests("libclang_rt.ubsan_minimal", staticVariant)
+ standaloneRuntime := result.ModuleForTests("libclang_rt.ubsan_standalone.static", staticVariant)
// The binaries, one with ubsan and one without
binWithUbsan := result.ModuleForTests("bin_with_ubsan", variant)
@@ -770,6 +791,7 @@
libSharedUbsan := result.ModuleForTests("libsharedubsan", sharedVariant)
binDependsUbsanShared := result.ModuleForTests("bin_depends_ubsan_shared", variant)
binNoUbsan := result.ModuleForTests("bin_no_ubsan", variant)
+ staticBin := result.ModuleForTests("static_bin_with_ubsan_dep", variant)
android.AssertStringListContains(t, "missing libclang_rt.ubsan_minimal in bin_with_ubsan static libs",
strings.Split(binWithUbsan.Rule("ld").Args["libFlags"], " "),
@@ -810,6 +832,11 @@
android.AssertStringListDoesNotContain(t, "unexpected -Wl,--exclude-libs for minimal runtime in bin_no_ubsan static libs",
strings.Split(binNoUbsan.Rule("ld").Args["ldFlags"], " "),
"-Wl,--exclude-libs="+minimalRuntime.OutputFiles(t, "")[0].Base())
+
+ android.AssertStringListContains(t, "missing libclang_rt.ubsan_standalone.static in static_bin_with_ubsan_dep static libs",
+ strings.Split(staticBin.Rule("ld").Args["libFlags"], " "),
+ standaloneRuntime.OutputFiles(t, "")[0].String())
+
}
t.Run("host", func(t *testing.T) { check(t, buildOS, preparer) })