Merge "Apply HWASan to libc-in-recovery."

This commit is contained in:
Treehugger Robot
2018-11-19 20:59:09 +00:00
committed by Gerrit Code Review

View File

@@ -299,7 +299,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
}
// 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
}