diff options
Diffstat (limited to 'java/fuzz.go')
| -rw-r--r-- | java/fuzz.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/fuzz.go b/java/fuzz.go index d37c55804..e5f1f04ee 100644 --- a/java/fuzz.go +++ b/java/fuzz.go @@ -85,10 +85,11 @@ func JavaFuzzFactory() android.Module { func (j *JavaFuzzTest) DepsMutator(ctx android.BottomUpMutatorContext) { if j.Os().Class.String() == deviceString { - j.testProperties.Jni_libs = append(j.testProperties.Jni_libs, artDeps...) + j.testProperties.Jni_libs.AppendSimpleValue(artDeps) } - if len(j.testProperties.Jni_libs) > 0 { + jniLibs := j.testProperties.Jni_libs.GetOrDefault(ctx, nil) + if len(jniLibs) > 0 { if j.fuzzPackagedModule.FuzzProperties.Fuzz_config == nil { config := &fuzz.FuzzConfig{} j.fuzzPackagedModule.FuzzProperties.Fuzz_config = config @@ -98,7 +99,7 @@ func (j *JavaFuzzTest) DepsMutator(ctx android.BottomUpMutatorContext) { j.fuzzPackagedModule.FuzzProperties.Fuzz_config.IsJni = proptools.BoolPtr(true) for _, target := range ctx.MultiTargets() { sharedLibVariations := append(target.Variations(), blueprint.Variation{Mutator: "link", Variation: "shared"}) - ctx.AddFarVariationDependencies(sharedLibVariations, jniLibTag, j.testProperties.Jni_libs...) + ctx.AddFarVariationDependencies(sharedLibVariations, jniLibTag, jniLibs...) } } |