Apply HWASan to libc-in-recovery.
HWASan is disabled in recovery strictly for code size, not for
correctness. With this change, HWASan binaries and libraries can be
used in recovery.
The real reason is the make build system which has no idea of the big
picture, and makes it hard to disable HWASan in _all_ recovery modules
recursively. A few static libraries have sneaked in.
Bug: 119582521
Test: sideload an OTA onto a hwasan device
Change-Id: I6536cc7bf5bfb37f939b585545a23c2068fbd47f
diff --git a/cc/sanitize.go b/cc/sanitize.go
index cd3b3e9..5ca5e5e 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -299,7 +299,8 @@
}
// HWASan ramdisk (which is built from recovery) goes over some bootloader limit.
- if ctx.inRecovery() {
+ // Keep libc instrumented so that recovery can run hwasan-instrumented code if necessary.
+ if ctx.inRecovery() && !strings.HasPrefix(ctx.ModuleDir(), "bionic/libc") {
s.Hwaddress = nil
}