StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Soong code, remove dead code, and clean up code for Java fuzz

Browse Source 
(cherry picked from commit fdf043a7b1)

Test: built fuzz targets locally and tested them with Jazzer
Change-Id: I3ff487ba4e34289e0f53f2077463f524f4bf4f11
This commit is contained in:
Cory Barker
2023-02-03 00:20:52 +00:00
committed by LaMont Jones
parent a2244043ea
commit eaf7f5ecb9
4 changed files with 71 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/androidmk.go
View File

@@ -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
}