Fix Soong code, remove dead code, and clean up code for Java fuzz
(cherry picked from commit fdf043a7b109250447f7c89bbeb29a1726a4d602)
Test: built fuzz targets locally and tested them with Jazzer
Change-Id: I3ff487ba4e34289e0f53f2077463f524f4bf4f11
diff --git a/java/androidmk.go b/java/androidmk.go
index 148d7c2..9c21633 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -133,13 +133,19 @@
return entriesList
}
-func (j *JavaFuzzLibrary) AndroidMkEntries() []android.AndroidMkEntries {
+func (j *JavaFuzzTest) AndroidMkEntries() []android.AndroidMkEntries {
entriesList := j.Library.AndroidMkEntries()
entries := &entriesList[0]
entries.ExtraEntries = append(entries.ExtraEntries, func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", "null-suite")
- androidMkWriteTestData(j.jniFilePaths, entries)
androidMkWriteTestData(android.Paths{j.implementationJarFile}, entries)
+ androidMkWriteTestData(j.jniFilePaths, entries)
+ if j.fuzzPackagedModule.Corpus != nil {
+ androidMkWriteTestData(j.fuzzPackagedModule.Corpus, entries)
+ }
+ if j.fuzzPackagedModule.Dictionary != nil {
+ androidMkWriteTestData(android.Paths{j.fuzzPackagedModule.Dictionary}, entries)
+ }
})
return entriesList
}