Merge "Soong frontend for shared library fuzzing." (722b02f8) · Commits · e / os / android_build_soong

cc/androidmk.go

+7 −6

Original line number	Diff line number	Diff line
		@@ -327,14 +327,15 @@ func (fuzz fuzzBinary) AndroidMk(ctx AndroidMkContext, ret android.AndroidMkDa
		filepath.Dir(fuzz.config.String())+":config.json")
		}

		if len(fuzzFiles) > 0 {
		ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
		fmt.Fprintln(w, "LOCAL_IS_FUZZ_TARGET := true")
		if len(fuzzFiles) > 0 {
		fmt.Fprintln(w, "LOCAL_TEST_DATA := "+strings.Join(fuzzFiles, " "))
		})
		}

		ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
		fmt.Fprintln(w, "LOCAL_IS_FUZZ_TARGET := true")
		if fuzz.installedSharedDeps != nil {
		fmt.Fprintln(w, "LOCAL_FUZZ_INSTALLED_SHARED_DEPS :="+
		strings.Join(fuzz.installedSharedDeps, " "))
		}
		})
		}

cc/fuzz.go

+150 −34

Original line number	Diff line number	Diff line
		@@ -17,10 +17,9 @@ package cc
		import (
		"encoding/json"
		"path/filepath"
		"sort"
		"strings"

		"github.com/google/blueprint/proptools"

		"android/soong/android"
		"android/soong/cc/config"
		)
		@@ -82,6 +81,7 @@ type fuzzBinary struct {
		corpus android.Paths
		corpusIntermediateDir android.Path
		config android.Path
		installedSharedDeps []string
		}

		func (fuzz *fuzzBinary) linkerProps() []interface{} {
		@@ -91,21 +91,6 @@ func (fuzz *fuzzBinary) linkerProps() []interface{} {
		}

		func (fuzz *fuzzBinary) linkerInit(ctx BaseModuleContext) {
		// Add ../lib[64] to rpath so that out/host/linux-x86/fuzz/<fuzzer> can
		// find out/host/linux-x86/lib[64]/library.so
		runpaths := []string{"../lib"}
		for _, runpath := range runpaths {
		if ctx.toolchain().Is64Bit() {
		runpath += "64"
		}
		fuzz.binaryDecorator.baseLinker.dynamicProperties.RunPaths = append(
		fuzz.binaryDecorator.baseLinker.dynamicProperties.RunPaths, runpath)
		}

		// add "" to rpath so that fuzzer binaries can find libraries in their own fuzz directory
		fuzz.binaryDecorator.baseLinker.dynamicProperties.RunPaths = append(
		fuzz.binaryDecorator.baseLinker.dynamicProperties.RunPaths, "")

		fuzz.binaryDecorator.linkerInit(ctx)
		}

		@@ -118,9 +103,80 @@ func (fuzz *fuzzBinary) linkerDeps(ctx DepsContext, deps Deps) Deps {

		func (fuzz *fuzzBinary) linkerFlags(ctx ModuleContext, flags Flags) Flags {
		flags = fuzz.binaryDecorator.linkerFlags(ctx, flags)
		// RunPaths on devices isn't instantiated by the base linker.
		flags.Local.LdFlags = append(flags.Local.LdFlags, `-Wl,-rpath,\$$ORIGIN/../lib`)
		return flags
		}

		// This function performs a breadth-first search over the provided module's
		// dependencies using `visitDirectDeps` to enumerate all shared library
		// dependencies. We require breadth-first expansion, as otherwise we may
		// incorrectly use the core libraries (sanitizer runtimes, libc, libdl, etc.)
		// from a dependency. This may cause issues when dependencies have explicit
		// sanitizer tags, as we may get a dependency on an unsanitized libc, etc.
		func collectAllSharedDependencies(
		module android.Module,
		sharedDeps map[string]android.Path,
		ctx android.SingletonContext) {
		var fringe []android.Module

		// Enumerate the first level of dependencies, as we discard all non-library
		// modules in the BFS loop below.
		ctx.VisitDirectDeps(module, func(dep android.Module) {
		fringe = append(fringe, dep)
		})

		for i := 0; i < len(fringe); i++ {
		module := fringe[i]
		if !isValidSharedDependency(module, sharedDeps) {
		continue
		}

		ccModule := module.(*Module)
		sharedDeps[ccModule.Name()] = ccModule.UnstrippedOutputFile()
		ctx.VisitDirectDeps(module, func(dep android.Module) {
		fringe = append(fringe, dep)
		})
		}
		}

		// This function takes a module and determines if it is a unique shared library
		// that should be installed in the fuzz target output directories. This function
		// returns true, unless:
		// - The module already exists in `sharedDeps`, or
		// - The module is not a shared library, or
		// - The module is a header, stub, or vendor-linked library.
		func isValidSharedDependency(
		dependency android.Module,
		sharedDeps map[string]android.Path) bool {
		// TODO(b/144090547): We should be parsing these modules using
		// ModuleDependencyTag instead of the current brute-force checking.

		if linkable, ok := dependency.(LinkableInterface); !ok \|\| // Discard non-linkables.
		!linkable.CcLibraryInterface() \|\| !linkable.Shared() \|\| // Discard static libs.
		linkable.UseVndk() \|\| // Discard vendor linked libraries.
		!linkable.CcLibrary() \|\| linkable.BuildStubs() { // Discard stubs libs (only CCLibrary variants).
		return false
		}

		// If this library has already been traversed, we don't need to do any more work.
		if _, exists := sharedDeps[dependency.Name()]; exists {
		return false
		}
		return true
		}

		func sharedLibraryInstallLocation(
		libraryPath android.Path, isHost bool, archString string) string {
		installLocation := "$(PRODUCT_OUT)/data"
		if isHost {
		installLocation = "$(HOST_OUT)"
		}
		installLocation = filepath.Join(
		installLocation, "fuzz", archString, "lib", libraryPath.Base())
		return installLocation
		}

		func (fuzz *fuzzBinary) install(ctx ModuleContext, file android.Path) {
		fuzz.binaryDecorator.baseInstaller.dir = filepath.Join(
		"fuzz", ctx.Target().Arch.ArchType.String(), ctx.ModuleName())
		@@ -160,6 +216,22 @@ func (fuzz *fuzzBinary) install(ctx ModuleContext, file android.Path) {
		})
		fuzz.config = configPath
		}

		// Grab the list of required shared libraries.
		sharedLibraries := make(map[string]android.Path)
		ctx.WalkDeps(func(child, parent android.Module) bool {
		if isValidSharedDependency(child, sharedLibraries) {
		sharedLibraries[child.Name()] = child.(*Module).UnstrippedOutputFile()
		return true
		}
		return false
		})

		for _, lib := range sharedLibraries {
		fuzz.installedSharedDeps = append(fuzz.installedSharedDeps,
		sharedLibraryInstallLocation(
		lib, ctx.Host(), ctx.Arch().ArchType.String()))
		}
		}

		func NewFuzz(hod android.HostOrDeviceSupported) *Module {
		@@ -193,21 +265,6 @@ func NewFuzz(hod android.HostOrDeviceSupported) *Module {
		ctx.AppendProperties(&disableDarwinAndLinuxBionic)
		})

		// Statically link the STL. This allows fuzz target deployment to not have to
		// include the STL.
		android.AddLoadHook(module, func(ctx android.LoadHookContext) {
		staticStlLinkage := struct {
		Target struct {
		Linux_glibc struct {
		Stl *string
		}
		}
		}{}

		staticStlLinkage.Target.Linux_glibc.Stl = proptools.StringPtr("libc++_static")
		ctx.AppendProperties(&staticStlLinkage)
		})

		return module
		}

		@@ -215,6 +272,8 @@ func NewFuzz(hod android.HostOrDeviceSupported) *Module {
		// their architecture & target/host specific zip file.
		type fuzzPackager struct {
		packages android.Paths
		sharedLibInstallStrings []string
		fuzzTargets map[string]bool
		}

		func fuzzPackagingFactory() android.Singleton {
		@@ -226,18 +285,31 @@ type fileToZip struct {
		DestinationPathPrefix string
		}

		type archAndLibraryKey struct {
		ArchDir android.OutputPath
		Library android.Path
		}

		func (s *fuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
		// Map between each architecture + host/device combination, and the files that
		// need to be packaged (in the tuple of {source file, destination folder in
		// archive}).
		archDirs := make(map[android.OutputPath][]fileToZip)

		// List of shared library dependencies for each architecture + host/device combo.
		archSharedLibraryDeps := make(map[archAndLibraryKey]bool)

		// List of individual fuzz targets, so that 'make fuzz' also installs the targets
		// to the correct output directories as well.
		s.fuzzTargets = make(map[string]bool)

		ctx.VisitAllModules(func(module android.Module) {
		// Discard non-fuzz targets.
		ccModule, ok := module.(*Module)
		if !ok {
		return
		}

		fuzzModule, ok := ccModule.compiler.(*fuzzBinary)
		if !ok {
		return
		@@ -249,6 +321,8 @@ func (s *fuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
		return
		}

		s.fuzzTargets[module.Name()] = true

		hostOrTargetString := "target"
		if ccModule.Host() {
		hostOrTargetString = "host"
		@@ -257,6 +331,29 @@ func (s *fuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
		archString := ccModule.Arch().ArchType.String()
		archDir := android.PathForIntermediates(ctx, "fuzz", hostOrTargetString, archString)

		// Grab the list of required shared libraries.
		sharedLibraries := make(map[string]android.Path)
		collectAllSharedDependencies(module, sharedLibraries, ctx)

		for _, library := range sharedLibraries {
		if _, exists := archSharedLibraryDeps[archAndLibraryKey{archDir, library}]; exists {
		continue
		}

		// For each architecture-specific shared library dependency, we need to
		// install it to the output directory. Setup the install destination here,
		// which will be used by $(copy-many-files) in the Make backend.
		archSharedLibraryDeps[archAndLibraryKey{archDir, library}] = true
		installDestination := sharedLibraryInstallLocation(
		library, ccModule.Host(), archString)
		// Escape all the variables, as the install destination here will be called
		// via. $(eval) in Make.
		installDestination = strings.ReplaceAll(
		installDestination, "$", "$$")
		s.sharedLibInstallStrings = append(s.sharedLibInstallStrings,
		library.String()+":"+installDestination)
		}

		// The executable.
		archDirs[archDir] = append(archDirs[archDir],
		fileToZip{ccModule.UnstrippedOutputFile(), ccModule.Name()})
		@@ -280,6 +377,12 @@ func (s *fuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
		}
		})

		// Add the shared library deps for packaging.
		for key, _ := range archSharedLibraryDeps {
		archDirs[key.ArchDir] = append(archDirs[key.ArchDir],
		fileToZip{key.Library, "lib"})
		}

		for archDir, filesToZip := range archDirs {
		arch := archDir.Base()
		hostOrTarget := filepath.Base(filepath.Dir(archDir.String()))
		@@ -302,9 +405,22 @@ func (s *fuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
		}

		func (s *fuzzPackager) MakeVars(ctx android.MakeVarsContext) {
		packages := s.packages.Strings()
		sort.Strings(packages)
		sort.Strings(s.sharedLibInstallStrings)
		// TODO(mitchp): Migrate this to use MakeVarsContext::DistForGoal() when it's
		// ready to handle phony targets created in Soong. In the meantime, this
		// exports the phony 'fuzz' target and dependencies on packages to
		// core/main.mk so that we can use dist-for-goals.
		ctx.Strict("SOONG_FUZZ_PACKAGING_ARCH_MODULES", strings.Join(s.packages.Strings(), " "))
		ctx.Strict("SOONG_FUZZ_PACKAGING_ARCH_MODULES", strings.Join(packages, " "))
		ctx.Strict("FUZZ_TARGET_SHARED_DEPS_INSTALL_PAIRS",
		strings.Join(s.sharedLibInstallStrings, " "))

		// Preallocate the slice of fuzz targets to minimise memory allocations.
		fuzzTargets := make([]string, 0, len(s.fuzzTargets))
		for target, _ := range s.fuzzTargets {
		fuzzTargets = append(fuzzTargets, target)
		}
		sort.Strings(fuzzTargets)
		ctx.Strict("ALL_FUZZ_TARGETS", strings.Join(fuzzTargets, " "))
		}