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

Merge "Add i386 host fuzzing support w/ cc_fuzz."

Browse Source
This commit is contained in:
Mitch Phillips
2019-09-10 22:35:42 +00:00
committed by Gerrit Code Review
parent 06b9611da4 4de896e1ef
commit 916f1e48dc
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cc/fuzz.go
View File

@@ -15,9 +15,12 @@
package cc package cc
import ( import (
"path/filepath"
"github.com/google/blueprint/proptools"
"android/soong/android" "android/soong/android"
"android/soong/cc/config" "android/soong/cc/config"
"github.com/google/blueprint/proptools"
) )
func init() { func init() {
@@ -78,21 +81,14 @@ func (fuzz *fuzzBinary) linkerFlags(ctx ModuleContext, flags Flags) Flags {
} }
func (fuzz *fuzzBinary) install(ctx ModuleContext, file android.Path) { func (fuzz *fuzzBinary) install(ctx ModuleContext, file android.Path) {
fuzz.binaryDecorator.baseInstaller.dir = "fuzz" fuzz.binaryDecorator.baseInstaller.dir = filepath.Join("fuzz", ctx.Target().Arch.ArchType.String())
fuzz.binaryDecorator.baseInstaller.dir64 = "fuzz" fuzz.binaryDecorator.baseInstaller.dir64 = filepath.Join("fuzz", ctx.Target().Arch.ArchType.String())
fuzz.binaryDecorator.baseInstaller.install(ctx, file) fuzz.binaryDecorator.baseInstaller.install(ctx, file)
} }
func NewFuzz(hod android.HostOrDeviceSupported) *Module { func NewFuzz(hod android.HostOrDeviceSupported) *Module {
module, binary := NewBinary(hod) module, binary := NewBinary(hod)
// TODO(mitchp): The toolchain does not currently export the x86 (32-bit)
// variant of libFuzzer for host. There is no way to only disable the host
// 32-bit variant, so we specify cc_fuzz targets as 64-bit only. This doesn't
// hurt anyone, as cc_fuzz is mostly for experimental targets as of this
// moment.
module.multilib = "64"
binary.baseInstaller = NewFuzzInstaller() binary.baseInstaller = NewFuzzInstaller()
module.sanitize.SetSanitizer(fuzzer, true) module.sanitize.SetSanitizer(fuzzer, true)