Merge "soong: HWASan exclude path support" into main (f3d52683) · Commits · e / os / android_build_soong

android/config.go

+8 −1

Original line number	Diff line number	Diff line
		@@ -1662,11 +1662,18 @@ func (c *config) MemtagHeapSyncEnabledForPath(path string) bool {
		return HasAnyPrefix(path, c.productVariables.MemtagHeapSyncIncludePaths) && !c.MemtagHeapDisabledForPath(path)
		}

		func (c *config) HWASanDisabledForPath(path string) bool {
		if len(c.productVariables.HWASanExcludePaths) == 0 {
		return false
		}
		return HasAnyPrefix(path, c.productVariables.HWASanExcludePaths)
		}

		func (c *config) HWASanEnabledForPath(path string) bool {
		if len(c.productVariables.HWASanIncludePaths) == 0 {
		return false
		}
		return HasAnyPrefix(path, c.productVariables.HWASanIncludePaths)
		return HasAnyPrefix(path, c.productVariables.HWASanIncludePaths) && !c.HWASanDisabledForPath(path)
		}

		func (c *config) VendorConfig(name string) VendorConfig {

+1 −0

Original line number	Diff line number	Diff line
		@@ -315,6 +315,7 @@ type ProductVariables struct {
		MemtagHeapSyncIncludePaths []string `json:",omitempty"`

		HWASanIncludePaths []string `json:",omitempty"`
		HWASanExcludePaths []string `json:",omitempty"`

		VendorPath *string `json:",omitempty"`
		OdmPath *string `json:",omitempty"`

+3 −1

Original line number	Diff line number	Diff line
		@@ -553,8 +553,10 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
		}

		if found, globalSanitizers = removeFromList("hwaddress", globalSanitizers); found && s.Hwaddress == nil {
		if !ctx.Config().HWASanDisabledForPath(ctx.ModuleDir()) {
		s.Hwaddress = proptools.BoolPtr(true)
		}
		}

		if found, globalSanitizers = removeFromList("writeonly", globalSanitizers); found && s.Writeonly == nil {
		// Hwaddress and Address are set before, so we can check them here