From eaf7f5ecb98ec34b1615ed289e369cef9f5bec2c Mon Sep 17 00:00:00 2001 From: Cory Barker Date: Fri, 3 Feb 2023 00:20:52 +0000 Subject: 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 --- java/androidmk.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'java/androidmk.go') diff --git a/java/androidmk.go b/java/androidmk.go index 148d7c276..9c21633fb 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -133,13 +133,19 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { 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 } -- cgit v1.2.3-59-g8ed1b