Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53a129db authored by Muhammad Haseeb Ahmad's avatar Muhammad Haseeb Ahmad Committed by Gerrit Code Review
Browse files

Merge "Make IsSanitizerEnabledForJni return false"

parents 027881cf e6567fe5

cc/sanitize.go

+4 −1
Original line number Diff line number Diff line
@@ -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

java/fuzz.go

+6 −5
Original line number Diff line number Diff line
@@ -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

}