Merge "Make IsSanitizerEnabledForJni return false"
This commit is contained in:
@@ -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
11
java/fuzz.go
@@ -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
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user