Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 296d5952 authored by Florian Mayer's avatar Florian Mayer
Browse files

Driveby: remove duplicate condition

Change-Id: I8deddf40542d92a69d87334a292d6d1c038ae69a
parent 029b0fce
Loading
Loading
Loading
Loading
+3 −11
Original line number Diff line number Diff line
@@ -189,16 +189,6 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
		}
	}

	// TODO:(b/178369775)
	// For now sanitizing is only supported on devices
	if ctx.Os() == android.Android && Bool(s.Fuzzer) {
		sanitize.Properties.SanitizerEnabled = true
	}

	if ctx.Os() == android.Android && Bool(s.Address) {
		sanitize.Properties.SanitizerEnabled = true
	}

	// HWASan requires AArch64 hardware feature (top-byte-ignore).
	if ctx.Arch().ArchType != android.Arm64 || !ctx.Os().Bionic() {
		s.Hwaddress = nil
@@ -219,7 +209,9 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
		s.Memtag_heap = nil
	}

	if ctx.Os() == android.Android && (Bool(s.Hwaddress) || Bool(s.Address) || Bool(s.Memtag_heap)) {
	// TODO:(b/178369775)
	// For now sanitizing is only supported on devices
	if ctx.Os() == android.Android && (Bool(s.Hwaddress) || Bool(s.Address) || Bool(s.Memtag_heap) || Bool(s.Fuzzer)) {
		sanitize.Properties.SanitizerEnabled = true
	}
}