Hwasan toolchain

core/androidbp_cclibs.go

@@ -172,15 +172,9 @@ func addMTEProps(m bpwriter.Module, props AndroidMTEProps) {
 	}
 }
 
-func addHWASANProps(m bpwriter.Module, props Build) {
-	memtagHeap := proptools.Bool(props.AndroidMTEProps.Mte.Memtag_heap)
-	if memtagHeap {
-		return
-	}
-	if proptools.Bool(props.Hwasan_enabled) {
-		g := m.NewGroup("sanitize")
-		g.AddBool("hwaddress", true)
-	}
+func addHWASANProps(m bpwriter.Module) {
+	g := m.NewGroup("sanitize")
+	g.AddBool("hwaddress", true)
 }
 
 func addRequiredModules(mod bpwriter.Module, m ModuleLibrary, ctx blueprint.ModuleContext) {
@@ -330,7 +324,7 @@ func addCcLibraryProps(mod bpwriter.Module, m ModuleLibrary, ctx blueprint.Modul
 	}
 }
 
-func addBinaryProps(mod bpwriter.Module, m ModuleBinary, ctx blueprint.ModuleContext, g *androidBpGenerator) {
+func addBinaryProps(mod bpwriter.Module, m *ModuleBinary, ctx blueprint.ModuleContext, g *androidBpGenerator) {
 	// Handle installation
 	if _, installRel, ok := getSoongInstallPath(m.getInstallableProps()); ok {
 		// Only setup multilib for target modules.
@@ -356,8 +350,11 @@ func addBinaryProps(mod bpwriter.Module, m ModuleBinary, ctx blueprint.ModuleCon
 	bc := GetModuleBackendConfiguration(ctx, m)
 	if bc != nil {
 		addMTEProps(mod, bc.GetMteProps(ctx))
+		if !proptools.Bool(bc.GetMteProps(ctx).Mte.Diag_memtag_heap) && bc.IsHwAsanEnabled() {
+			addHWASANProps(mod)
+		}
 	}
-	addHWASANProps(mod, m.Properties.Build)
+
 }
 
 func addStaticOrSharedLibraryProps(mod bpwriter.Module, m ModuleLibrary, ctx blueprint.ModuleContext) {
@@ -375,7 +372,6 @@ func addStaticOrSharedLibraryProps(mod bpwriter.Module, m ModuleLibrary, ctx blu
 	if m.Properties.TargetType == toolchain.TgtTypeTarget && !linksToGeneratedLibrary(ctx) {
 		mod.AddString("compile_multilib", "both")
 	}
-	addHWASANProps(mod, m.Properties.Build)
 }
 
 func addStripProp(m bpwriter.Module) {
@@ -574,7 +570,7 @@ func (g *androidBpGenerator) binaryActions(m *ModuleBinary, ctx blueprint.Module
 	}
 
 	addCcLibraryProps(mod, m.ModuleLibrary, ctx)
-	addBinaryProps(mod, *m, ctx, g)
+	addBinaryProps(mod, m, ctx, g)
 	bc := GetModuleBackendConfiguration(ctx, m)
 	if bc.strip() {
 		addStripProp(mod)
@@ -626,6 +622,10 @@ func (g *androidBpGenerator) sharedActions(m *ModuleSharedLibrary, ctx blueprint
 		addStripProp(mod)
 	}
 
+	if !proptools.Bool(bc.GetMteProps(ctx).Mte.Diag_memtag_heap) && bc.IsHwAsanEnabled() {
+		addHWASANProps(mod)
+	}
+
 	versionScript := g.getVersionScript(&m.ModuleLibrary, ctx)
 	if versionScript != nil {
 		mod.AddString("version_script", *versionScript)
@@ -652,6 +652,13 @@ func (g *androidBpGenerator) staticActions(m *ModuleStaticLibrary, ctx blueprint
 
 	addCcLibraryProps(mod, m.ModuleLibrary, ctx)
 	addStaticOrSharedLibraryProps(mod, m.ModuleLibrary, ctx)
+
+	bc := GetModuleBackendConfiguration(ctx, m)
+	if bc != nil {
+		if !proptools.Bool(bc.GetMteProps(ctx).Mte.Diag_memtag_heap) && bc.IsHwAsanEnabled() {
+			addHWASANProps(mod)
+		}
+	}
 }
 
 func proxyCflags(m *ModuleStrictLibrary) []string {
@@ -701,6 +708,10 @@ func (g *androidBpGenerator) strictLibraryActions(m *ModuleStrictLibrary, ctx bl
 
 	addProvenanceProps(ctx, mod, m)
 
+	if bc != nil && !proptools.Bool(bc.GetMteProps(ctx).Mte.Diag_memtag_heap) && bc.IsHwAsanEnabled() {
+		addHWASANProps(mod)
+	}
+
 	// TODO: Make addPGOProps generic and enable it if needed
 	// addPGOProps(mod, m.Properties.Build.AndroidPGOProps)
 
@@ -748,6 +759,10 @@ func (g *androidBpGenerator) executableTestActions(m *ModuleTest, ctx blueprint.
 
 	addProvenanceProps(ctx, mod, m)
 
+	if bc != nil && !proptools.Bool(bc.GetMteProps(ctx).Mte.Diag_memtag_heap) && bc.IsHwAsanEnabled() {
+		addHWASANProps(mod)
+	}
+
 	// Avoid using cc_test default setup
 	// TODO: `relative_install_path` needed - Module install directory may only be disabled if relative_install_path is set
 	// mod.AddBool("no_named_install_directory", true)
@@ -781,6 +796,10 @@ func (g *androidBpGenerator) strictBinaryActions(m *ModuleStrictBinary, ctx blue
 		addStripProp(mod)
 	}
 
+	if bc != nil && !proptools.Bool(bc.GetMteProps(ctx).Mte.Diag_memtag_heap) && bc.IsHwAsanEnabled() {
+		addHWASANProps(mod)
+	}
+
 	if m.Properties.TargetType == toolchain.TgtTypeTarget && !linksToGeneratedLibrary(ctx) {
 		mod.AddString("compile_multilib", "both")
 	}

core/binary.go

@@ -16,9 +16,10 @@ type binaryInterface interface {
 	file.Provider // A binary can provide itself as a source
 }
 
-var _ binaryInterface = (*ModuleBinary)(nil)      // impl check
-var _ libraryInterface = (*ModuleBinary)(nil)     // impl check
-var _ BackendConfiguration = (*ModuleBinary)(nil) // impl check
+var _ binaryInterface = (*ModuleBinary)(nil)              // impl check
+var _ libraryInterface = (*ModuleBinary)(nil)             // impl check
+var _ BackendConfiguration = (*ModuleBinary)(nil)         // impl check
+var _ BackendConfigurationProvider = (*ModuleBinary)(nil) // impl check
 
 func (m *ModuleBinary) OutFiles() (srcs file.Paths) {
 	return file.Paths{file.NewPath(m.outputName(), string(m.getTarget()), file.TypeBinary|file.TypeExecutable|file.TypeInstallable)}

core/library.go

@@ -14,6 +14,7 @@ import (
 	"github.com/ARM-software/bob-build/internal/utils"
 
 	"github.com/google/blueprint"
+	"github.com/google/blueprint/proptools"
 )
 
 var depOutputsVarRegexp = regexp.MustCompile(`^\$\{(.+)_out\}$`)
@@ -461,6 +462,10 @@ func (m *ModuleLibrary) GetMteProps(blueprint.ModuleContext) AndroidMTEProps {
 	return m.Properties.AndroidMTEProps
 }
 
+func (m *ModuleLibrary) IsHwAsanEnabled() bool {
+	return proptools.Bool(m.Properties.Build.Hwasan_enabled)
+}
+
 func (m *ModuleLibrary) IsForwardingSharedLibrary() bool {
 	return m.Properties.isForwardingSharedLibrary()
 }

core/library_shared.go

@@ -25,7 +25,9 @@ const (
 var _ linkableModule = (*ModuleSharedLibrary)(nil)
 var _ sharedLibProducer = (*ModuleSharedLibrary)(nil)
 var _ stripable = (*ModuleSharedLibrary)(nil)
-var _ libraryInterface = (*ModuleSharedLibrary)(nil) // impl check
+var _ libraryInterface = (*ModuleSharedLibrary)(nil)             // impl check
+var _ BackendConfiguration = (*ModuleSharedLibrary)(nil)         // impl check
+var _ BackendConfigurationProvider = (*ModuleSharedLibrary)(nil) // impl check
 
 func (m *ModuleSharedLibrary) OutFiles() (files file.Paths) {
 

core/library_static.go

@@ -9,7 +9,9 @@ type ModuleStaticLibrary struct {
 	ModuleLibrary
 }
 
-var _ libraryInterface = (*ModuleStaticLibrary)(nil) // impl check
+var _ libraryInterface = (*ModuleStaticLibrary)(nil)             // impl check
+var _ BackendConfiguration = (*ModuleStaticLibrary)(nil)         // impl check
+var _ BackendConfigurationProvider = (*ModuleStaticLibrary)(nil) // impl check
 
 func (m *ModuleStaticLibrary) GenerateBuildActions(ctx blueprint.ModuleContext) {
 	if isEnabled(m) {

core/module_toolchain.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ARM-software/bob-build/core/toolchain"
 	"github.com/ARM-software/bob-build/core/toolchain/mapper"
 	"github.com/google/blueprint"
+	"github.com/google/blueprint/proptools"
 )
 
 type ModuleToolchainProps struct {
@@ -31,6 +32,8 @@ type ModuleToolchainProps struct {
 	Build_wrapper *string
 
 	AndroidMTEProps
+
+	Hwasan_enabled *bool
 }
 
 type ToolchainFlagsProps struct {
@@ -64,18 +67,17 @@ type BackendConfiguration interface {
 	stripable
 	GetBuildWrapperAndDeps(blueprint.ModuleContext) (string, []string)
 	GetMteProps(blueprint.ModuleContext) AndroidMTEProps
+	IsHwAsanEnabled() bool
 }
 
 // This interface provides configuration features
 type BackendConfigurationProvider interface {
 	GetBackendConfiguration(blueprint.ModuleContext) BackendConfiguration
 }
 
-func GetModuleBackendConfiguration(ctx blueprint.ModuleContext, m interface{}) BackendConfiguration {
-	if capable, ok := m.(BackendConfigurationProvider); ok {
-		if bc := capable.GetBackendConfiguration(ctx); bc != nil {
-			return bc
-		}
+func GetModuleBackendConfiguration(ctx blueprint.ModuleContext, m BackendConfigurationProvider) BackendConfiguration {
+	if bc := m.GetBackendConfiguration(ctx); bc != nil {
+		return bc
 	}
 	return nil
 }
@@ -169,6 +171,10 @@ func (m *ModuleToolchain) GetBuildWrapperAndDeps(ctx blueprint.ModuleContext) (s
 	return "", []string{}
 }
 
+func (m *ModuleToolchain) IsHwAsanEnabled() bool {
+	return proptools.Bool(m.Properties.Hwasan_enabled)
+}
+
 func (m *ModuleToolchain) FlagsOut() flag.Flags {
 	lut := flag.FlagParserTable{
 		{

gendiffer/tests/shared_library/hwasan/app/bplist

@@ -0,0 +1 @@
+build.bp

gendiffer/tests/shared_library/hwasan/app/build.bp

@@ -0,0 +1,14 @@
+
+
+bob_shared_library {
+    name: "libshared",
+    srcs: ["src.cpp"],
+    hwasan_enabled: true,
+}
+
+bob_binary {
+    hwasan_enabled: true,
+    name: "bob_binary",
+    srcs: ["src.cpp"],
+    shared_libs: ["libshared"],
+}

gendiffer/tests/shared_library/hwasan/out/android/Android.bp.out

@@ -0,0 +1,27 @@
+
+genrule {
+    name: "_check_buildbp_updates_redacted",
+    srcs: ["build.bp"],
+    out: ["androidbp_up_to_date"],
+    tool_files: ["scripts/verify_hash.py"],
+    cmd: "python $(location scripts/verify_hash.py) --hash redacted --out $(out) -- $(in)",
+}
+
+cc_binary {
+    name: "bob_binary",
+    srcs: ["src.cpp"],
+    shared_libs: ["libshared"],
+    sanitize: {
+        hwaddress: true,
+    },
+}
+
+cc_library_shared {
+    name: "libshared",
+    srcs: ["src.cpp"],
+    compile_multilib: "both",
+    sanitize: {
+        hwaddress: true,
+    },
+}
+

gendiffer/tests/shared_library/hwasan/out/android/expectedExitCode.int

@@ -0,0 +1 @@
+0