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

Commit 9e1f9b9d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove an unused PackageFuzzModule arg" into main

parents 5d3e33c5 a4e89ba5

cc/fuzz.go

+2 −2
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ func SharedLibrarySymbolsInstallLocation(libraryBase string, isVendor bool, fuzz 
}



func (fuzzBin *fuzzBinary) install(ctx ModuleContext, file android.Path) {

	fuzzBin.fuzzPackagedModule = PackageFuzzModule(ctx, fuzzBin.fuzzPackagedModule, pctx)

	fuzzBin.fuzzPackagedModule = PackageFuzzModule(ctx, fuzzBin.fuzzPackagedModule)



	installBase := "fuzz"
@@ -345,7 +345,7 @@ func (fuzzBin *fuzzBinary) install(ctx ModuleContext, file android.Path) { 
	fuzzBin.binaryDecorator.baseInstaller.install(ctx, file)

}



func PackageFuzzModule(ctx android.ModuleContext, fuzzPackagedModule fuzz.FuzzPackagedModule, pctx android.PackageContext) fuzz.FuzzPackagedModule {

func PackageFuzzModule(ctx android.ModuleContext, fuzzPackagedModule fuzz.FuzzPackagedModule) fuzz.FuzzPackagedModule {

	fuzzPackagedModule.Corpus = android.PathsForModuleSrc(ctx, fuzzPackagedModule.FuzzProperties.Corpus)

	fuzzPackagedModule.Corpus = append(fuzzPackagedModule.Corpus, android.PathsForModuleSrc(ctx, fuzzPackagedModule.FuzzProperties.Device_common_corpus)...)

java/fuzz.go

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ func (j *JavaFuzzTest) DepsMutator(ctx android.BottomUpMutatorContext) { 
}



func (j *JavaFuzzTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	j.fuzzPackagedModule = cc.PackageFuzzModule(ctx, j.fuzzPackagedModule, pctx)

	j.fuzzPackagedModule = cc.PackageFuzzModule(ctx, j.fuzzPackagedModule)



	_, sharedDeps := cc.CollectAllSharedDependencies(ctx)

	for _, dep := range sharedDeps {

rust/fuzz.go

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ func (fuzzer *fuzzDecorator) autoDep(ctx android.BottomUpMutatorContext) autoDep 
}



func (fuzz *fuzzDecorator) install(ctx ModuleContext) {

	fuzz.fuzzPackagedModule = cc.PackageFuzzModule(ctx, fuzz.fuzzPackagedModule, pctx)

	fuzz.fuzzPackagedModule = cc.PackageFuzzModule(ctx, fuzz.fuzzPackagedModule)



	installBase := "fuzz"