tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Make IsSanitizerEnabledForJni return false" am: 53a129db89

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

Change-Id: Ibb3a1ff7d96fe50584aa576f4c0fb9ea626b5144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Muhammad Haseeb Ahmad 2022-05-25 06:40:20 +00:00 committed by Automerger Merge Worker
commit e353655540
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cc/sanitize.go
View file

@ -1428,9 +1428,12 @@ func sanitizerMutator(t SanitizerType) func(android.BottomUpMutatorContext) {
}
}
} else if sanitizeable, ok := mctx.Module().(Sanitizeable); ok && sanitizeable.IsSanitizerEnabled(mctx, t.name()) {
// APEX and Java fuzz modules fall here
// APEX fuzz modules fall here
sanitizeable.AddSanitizerDependencies(mctx, t.name())
mctx.CreateVariations(t.variationName())
} else if _, ok := mctx.Module().(JniSanitizeable); ok {
// Java fuzz modules fall here
mctx.CreateVariations(t.variationName())
} else if c, ok := mctx.Module().(*Module); ok {
//TODO: When Rust modules have vendor support, enable this path for PlatformSanitizeable

11
java/fuzz.go
View file

@ -54,11 +54,12 @@ type JavaFuzzLibrary struct {
// cc.JniSanitizeable. It returns a bool for whether a cc dependency should be
// sanitized for the given sanitizer or not.
func (j *JavaFuzzLibrary) IsSanitizerEnabledForJni(ctx android.BaseModuleContext, sanitizerName string) bool {
for _, s := range j.jniProperties.Sanitizers {
if sanitizerName == s {
return true
}
}
// TODO: once b/231370928 is resolved, please uncomment the loop
// for _, s := range j.jniProperties.Sanitizers {
// if sanitizerName == s {
// return true
// }
// }
return false
}