From 431ddf9b7647a88bf36b004d94bfaff940c1f92b Mon Sep 17 00:00:00 2001 From: Muhammad Haseeb Ahmad Date: Thu, 20 Oct 2022 00:55:58 +0000 Subject: Output shared dependendencies of JNI libs for Java fuzzers Test: m example_java_jni_fuzzer Bug: 252846698 Change-Id: Ib583de335482350bfe293f9c3d021a595edd4f44 --- java/fuzz.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'java/fuzz.go') diff --git a/java/fuzz.go b/java/fuzz.go index 848d364f1..1d6b91346 100644 --- a/java/fuzz.go +++ b/java/fuzz.go @@ -104,7 +104,9 @@ func (j *JavaFuzzLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) j.fuzzPackagedModule.Config = configPath } - ctx.VisitDirectDepsWithTag(cc.JniFuzzLibTag, func(dep android.Module) { + _, sharedDeps := cc.CollectAllSharedDependencies(ctx) + + for _, dep := range sharedDeps { sharedLibInfo := ctx.OtherModuleProvider(dep, cc.SharedLibraryInfoProvider).(cc.SharedLibraryInfo) if sharedLibInfo.SharedLibrary != nil { // The .class jars are output in slightly different locations @@ -127,7 +129,7 @@ func (j *JavaFuzzLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) } else { ctx.PropertyErrorf("jni_libs", "%q of type %q is not supported", dep.Name(), ctx.OtherModuleType(dep)) } - }) + } j.Library.GenerateAndroidBuildActions(ctx) } -- cgit v1.2.3-59-g8ed1b