StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restrict IsSanitizerEnabled() to android.Config()." am: 1c6502eba2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2127446

Change-Id: I26f923fcf0f5ab54348fd14e98c87757abb4f181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-06-17 22:27:10 +00:00
committed by Automerger Merge Worker
parent bbbc7bfb85 1c6502eba2
commit 7125d5d606
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apex/apex.go
View File

@@ -1468,7 +1468,7 @@ func (a *apexBundle) EnableSanitizer(sanitizerName string) {
} }
} }
func (a *apexBundle) IsSanitizerEnabled(ctx android.BaseModuleContext, sanitizerName string) bool { func (a *apexBundle) IsSanitizerEnabled(config android.Config, sanitizerName string) bool {
if android.InList(sanitizerName, a.properties.SanitizerNames) { if android.InList(sanitizerName, a.properties.SanitizerNames) {
return true return true
} }
@@ -1476,11 +1476,11 @@ func (a *apexBundle) IsSanitizerEnabled(ctx android.BaseModuleContext, sanitizer
// Then follow the global setting // Then follow the global setting
globalSanitizerNames := []string{} globalSanitizerNames := []string{}
if a.Host() { if a.Host() {
globalSanitizerNames = ctx.Config().SanitizeHost() globalSanitizerNames = config.SanitizeHost()
} else { } else {
arches := ctx.Config().SanitizeDeviceArch() arches := config.SanitizeDeviceArch()
if len(arches) == 0 || android.InList(a.Arch().ArchType.Name, arches) { if len(arches) == 0 || android.InList(a.Arch().ArchType.Name, arches) {
globalSanitizerNames = ctx.Config().SanitizeDevice() globalSanitizerNames = config.SanitizeDevice()
} }
} }
return android.InList(sanitizerName, globalSanitizerNames) return android.InList(sanitizerName, globalSanitizerNames)

4
cc/sanitize.go
View File

@@ -1289,7 +1289,7 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
type Sanitizeable interface { type Sanitizeable interface {
android.Module android.Module
IsSanitizerEnabled(ctx android.BaseModuleContext, sanitizerName string) bool IsSanitizerEnabled(config android.Config, sanitizerName string) bool
EnableSanitizer(sanitizerName string) EnableSanitizer(sanitizerName string)
AddSanitizerDependencies(ctx android.BottomUpMutatorContext, sanitizerName string) AddSanitizerDependencies(ctx android.BottomUpMutatorContext, sanitizerName string)
} }
@@ -1427,7 +1427,7 @@ func sanitizerMutator(t SanitizerType) func(android.BottomUpMutatorContext) {
} }
} }
} }
} else if sanitizeable, ok := mctx.Module().(Sanitizeable); ok && sanitizeable.IsSanitizerEnabled(mctx, t.name()) { } else if sanitizeable, ok := mctx.Module().(Sanitizeable); ok && sanitizeable.IsSanitizerEnabled(mctx.Config(), t.name()) {
// APEX fuzz modules fall here // APEX fuzz modules fall here
sanitizeable.AddSanitizerDependencies(mctx, t.name()) sanitizeable.AddSanitizerDependencies(mctx, t.name())
mctx.CreateVariations(t.variationName()) mctx.CreateVariations(t.variationName())