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

Build and package Java fuzzers for device

Browse Source 
Bug: 246398305
Test: SANITIZE_TARGET="fuzzer hwaddress" build/soong/soong_ui.bash --make-mode -j86 haiku-java-device dist DIST_DIR="/usr/local/google/home/mhahmad/Desktop/android2/OUT"
Test: SANITIZE_HOST="fuzzer address" build/soong/soong_ui.bash --make-mode -j86 haiku-java-host dist DIST_DIR="/usr/local/google/home/mhahmad/Desktop/android2/OUT"
Change-Id: I52c1a6292f5555490aabcb97a449b6c32d57c074
This commit is contained in:
Muhammad Haseeb Ahmad
2022-09-28 17:53:11 +00:00
parent d4961319a9
commit eb14ff2a06
2 changed files with 91 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
java/fuzz.go
View File

@@ -15,6 +15,7 @@
package java
import (
"path/filepath"
"sort"
"strings"
@@ -26,6 +27,11 @@ import (
"android/soong/fuzz"
)
const (
hostString = "host"
targetString = "target"
)
type jniProperties struct {
// list of jni libs
Jni_libs []string
@@ -39,8 +45,10 @@ func init() {
}
func RegisterJavaFuzzBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("java_fuzz_host", FuzzFactory)
ctx.RegisterSingletonType("java_fuzz_packaging", javaFuzzPackagingFactory)
ctx.RegisterModuleType("java_fuzz", JavaFuzzFactory)
ctx.RegisterModuleType("java_fuzz_host", JavaFuzzHostFactory)
ctx.RegisterSingletonType("java_fuzz_host_packaging", javaFuzzHostPackagingFactory)
ctx.RegisterSingletonType("java_fuzz_device_packaging", javaFuzzDevicePackagingFactory)
}
type JavaFuzzLibrary struct {
@@ -55,11 +63,11 @@ type JavaFuzzLibrary struct {
// sanitized for the given sanitizer or not.
func (j *JavaFuzzLibrary) IsSanitizerEnabledForJni(ctx android.BaseModuleContext, sanitizerName string) bool {
// TODO: once b/231370928 is resolved, please uncomment the loop
// for _, s := range j.jniProperties.Sanitizers {
// if sanitizerName == s {
// return true
// }
// }
// for _, s := range j.jniProperties.Sanitizers {
// if sanitizerName == s {
// return true
// }
// }
return false
}
@@ -72,7 +80,6 @@ func (j *JavaFuzzLibrary) DepsMutator(mctx android.BottomUpMutatorContext) {
// this will be used by the ingestion pipeline to determine the version
// of jazzer to add to the fuzzer package
j.fuzzPackagedModule.FuzzProperties.Fuzz_config.IsJni = proptools.BoolPtr(true)
for _, target := range mctx.MultiTargets() {
sharedLibVariations := append(target.Variations(), blueprint.Variation{Mutator: "link", Variation: "shared"})
mctx.AddFarVariationDependencies(sharedLibVariations, cc.JniFuzzLibTag, j.jniProperties.Jni_libs...)
@@ -91,7 +98,6 @@ func (j *JavaFuzzLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext)
if j.fuzzPackagedModule.FuzzProperties.Dictionary != nil {
j.fuzzPackagedModule.Dictionary = android.PathForModuleSrc(ctx, *j.fuzzPackagedModule.FuzzProperties.Dictionary)
}
if j.fuzzPackagedModule.FuzzProperties.Fuzz_config != nil {
configPath := android.PathForModuleOut(ctx, "config").Join(ctx, "config.json")
android.WriteFileRule(ctx, configPath, j.fuzzPackagedModule.FuzzProperties.Fuzz_config.String())
@@ -101,7 +107,17 @@ func (j *JavaFuzzLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext)
ctx.VisitDirectDepsWithTag(cc.JniFuzzLibTag, func(dep android.Module) {
sharedLibInfo := ctx.OtherModuleProvider(dep, cc.SharedLibraryInfoProvider).(cc.SharedLibraryInfo)
if sharedLibInfo.SharedLibrary != nil {
libPath := android.PathForModuleOut(ctx, sharedLibInfo.SharedLibrary.Base())
// The .class jars are output in slightly different locations
// relative to the jni libs. Therefore, for consistency across
// host and device fuzzers of jni lib location, we save it in a
// native_libs directory.
var relPath string
if sharedLibInfo.Target.Arch.ArchType.Multilib == "lib64" {
relPath = filepath.Join("lib64", sharedLibInfo.SharedLibrary.Base())
} else {
relPath = filepath.Join("lib", sharedLibInfo.SharedLibrary.Base())
}
libPath := android.PathForModuleOut(ctx, relPath)
ctx.Build(pctx, android.BuildParams{
Rule: android.Cp,
Input: sharedLibInfo.SharedLibrary,
@@ -116,13 +132,12 @@ func (j *JavaFuzzLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext)
j.Library.GenerateAndroidBuildActions(ctx)
}
// java_fuzz builds and links sources into a `.jar` file for the host.
// java_fuzz_host builds and links sources into a `.jar` file for the host.
//
// By default, a java_fuzz produces a `.jar` file containing `.class` files.
// This jar is not suitable for installing on a device.
func FuzzFactory() android.Module {
func JavaFuzzHostFactory() android.Module {
module := &JavaFuzzLibrary{}
module.addHostProperties()
module.AddProperties(&module.jniProperties)
module.Module.properties.Installable = proptools.BoolPtr(true)
@@ -141,23 +156,54 @@ func FuzzFactory() android.Module {
ctx.AppendProperties(&disableLinuxBionic)
})
module.initModuleAndImport(module)
android.InitSdkAwareModule(module)
InitJavaModuleMultiTargets(module, android.HostSupported)
InitJavaModuleMultiTargets(module, android.HostSupportedNoCross)
return module
}
// Responsible for generating rules that package fuzz targets into
// their architecture & target/host specific zip file.
type javaFuzzPackager struct {
// java_fuzz builds and links sources into a `.jar` file for the device.
// This generates .class files in a jar which can then be instrumented before
// fuzzing in Android Runtime (ART: Android OS on emulator or device)
func JavaFuzzFactory() android.Module {
module := &JavaFuzzLibrary{}
module.addHostAndDeviceProperties()
module.AddProperties(&module.jniProperties)
module.Module.properties.Installable = proptools.BoolPtr(true)
module.AddProperties(&module.fuzzPackagedModule.FuzzProperties)
module.Module.dexpreopter.isTest = true
module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true)
InitJavaModuleMultiTargets(module, android.DeviceSupported)
return module
}
// Responsible for generating rules that package host fuzz targets into
// a zip file.
type javaFuzzHostPackager struct {
fuzz.FuzzPackager
}
func javaFuzzPackagingFactory() android.Singleton {
return &javaFuzzPackager{}
// Responsible for generating rules that package device fuzz targets into
// a zip file.
type javaFuzzDevicePackager struct {
fuzz.FuzzPackager
}
func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
func javaFuzzHostPackagingFactory() android.Singleton {
return &javaFuzzHostPackager{}
}
func javaFuzzDevicePackagingFactory() android.Singleton {
return &javaFuzzDevicePackager{}
}
func (s *javaFuzzHostPackager) GenerateBuildActions(ctx android.SingletonContext) {
generateBuildActions(&s.FuzzPackager, hostString, ctx)
}
func (s *javaFuzzDevicePackager) GenerateBuildActions(ctx android.SingletonContext) {
generateBuildActions(&s.FuzzPackager, targetString, ctx)
}
func generateBuildActions(s *fuzz.FuzzPackager, hostOrTargetString string, ctx android.SingletonContext) {
// Map between each architecture + host/device combination.
archDirs := make(map[fuzz.ArchOs][]fuzz.FileToZip)
@@ -171,8 +217,14 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
return
}
if javaFuzzModule.Target().HostCross {
return
if hostOrTargetString == hostString {
if !javaFuzzModule.Host() {
return
}
} else if hostOrTargetString == targetString {
if javaFuzzModule.Host() || javaFuzzModule.Target().HostCross {
return
}
}
fuzzModuleValidator := fuzz.FuzzModule{
@@ -185,12 +237,7 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
return
}
hostOrTargetString := "target"
if javaFuzzModule.Host() {
hostOrTargetString = "host"
}
archString := javaFuzzModule.Arch().ArchType.String()
archDir := android.PathForIntermediates(ctx, "fuzz", hostOrTargetString, archString)
archOs := fuzz.ArchOs{HostOrTarget: hostOrTargetString, Arch: archString, Dir: archDir.String()}
@@ -201,7 +248,7 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
files = s.PackageArtifacts(ctx, module, javaFuzzModule.fuzzPackagedModule, archDir, builder)
// Add .jar
files = append(files, fuzz.FileToZip{javaFuzzModule.outputFile, ""})
files = append(files, fuzz.FileToZip{javaFuzzModule.implementationJarFile, ""})
// Add jni .so files
for _, fPath := range javaFuzzModule.jniFilePaths {
@@ -217,12 +264,22 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
s.CreateFuzzPackage(ctx, archDirs, fuzz.Java, pctx)
}
func (s *javaFuzzPackager) MakeVars(ctx android.MakeVarsContext) {
func (s *javaFuzzHostPackager) MakeVars(ctx android.MakeVarsContext) {
packages := s.Packages.Strings()
sort.Strings(packages)
ctx.Strict("SOONG_JAVA_FUZZ_PACKAGING_ARCH_MODULES", strings.Join(packages, " "))
ctx.Strict("SOONG_JAVA_FUZZ_HOST_PACKAGING_ARCH_MODULES", strings.Join(packages, " "))
// Preallocate the slice of fuzz targets to minimize memory allocations.
s.PreallocateSlice(ctx, "ALL_JAVA_FUZZ_TARGETS")
s.PreallocateSlice(ctx, "ALL_JAVA_FUZZ_HOST_TARGETS")
}
func (s *javaFuzzDevicePackager) MakeVars(ctx android.MakeVarsContext) {
packages := s.Packages.Strings()
sort.Strings(packages)
ctx.Strict("SOONG_JAVA_FUZZ_DEVICE_PACKAGING_ARCH_MODULES", strings.Join(packages, " "))
// Preallocate the slice of fuzz targets to minimize memory allocations.
s.PreallocateSlice(ctx, "ALL_JAVA_FUZZ_DEVICE_TARGETS")
}