Merge "Don't use hwasan for non-bionic arm64 targets" (44c20b88) · Commits · e / os / android_build_soong

cc/sanitize.go

+4 −4

Original line number	Diff line number	Diff line
		@@ -430,7 +430,7 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
		}

		// Enable Memtag for all components in the include paths (for Aarch64 only)
		if ctx.Arch().ArchType == android.Arm64 {
		if ctx.Arch().ArchType == android.Arm64 && ctx.toolchain().Bionic() {
		if ctx.Config().MemtagHeapSyncEnabledForPath(ctx.ModuleDir()) {
		if s.Memtag_heap == nil {
		s.Memtag_heap = proptools.BoolPtr(true)
		@@ -460,17 +460,17 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
		}

		// HWASan requires AArch64 hardware feature (top-byte-ignore).
		if ctx.Arch().ArchType != android.Arm64 {
		if ctx.Arch().ArchType != android.Arm64 \|\| !ctx.toolchain().Bionic() {
		s.Hwaddress = nil
		}

		// SCS is only implemented on AArch64.
		if ctx.Arch().ArchType != android.Arm64 {
		if ctx.Arch().ArchType != android.Arm64 \|\| !ctx.toolchain().Bionic() {
		s.Scs = nil
		}

		// Memtag_heap is only implemented on AArch64.
		if ctx.Arch().ArchType != android.Arm64 {
		if ctx.Arch().ArchType != android.Arm64 \|\| !ctx.toolchain().Bionic() {
		s.Memtag_heap = nil
		}