diff options
| author | 2023-02-03 00:20:52 +0000 | |
|---|---|---|
| committer | 2023-05-17 19:07:16 +0000 | |
| commit | eaf7f5ecb98ec34b1615ed289e369cef9f5bec2c (patch) | |
| tree | bf46573f02db6acba6e2f0df00e5c32ce0b327d3 /java/androidmk.go | |
| parent | a2244043eacf0871fa43fe7de3824330cd0e4eb6 (diff) | |
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
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 10 |
1 files changed, 8 insertions, 2 deletions
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 } |