openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Add i386 host fuzzing support w/ cc_fuzz." am: 916f1e48dc am: 69d0cb8075 

am: 17ab0433db

Change-Id: I897da1d52bb89be5991de9189cc32235fd47e756
This commit is contained in:
Mitch Phillips 2019-09-10 15:58:06 -07:00 committed by android-build-merger
parent 2afbc97f8f 17ab0433db
commit fcd4f4da58
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cc/fuzz.go
View File

@ -15,9 +15,12 @@
package cc
import (
"path/filepath"
"github.com/google/blueprint/proptools"
"android/soong/android"
"android/soong/cc/config"
"github.com/google/blueprint/proptools"
)
func init() {
@ -78,21 +81,14 @@ func (fuzz *fuzzBinary) linkerFlags(ctx ModuleContext, flags Flags) Flags {
}
func (fuzz *fuzzBinary) install(ctx ModuleContext, file android.Path) {
fuzz.binaryDecorator.baseInstaller.dir = "fuzz"
fuzz.binaryDecorator.baseInstaller.dir64 = "fuzz"
fuzz.binaryDecorator.baseInstaller.dir = filepath.Join("fuzz", ctx.Target().Arch.ArchType.String())
fuzz.binaryDecorator.baseInstaller.dir64 = filepath.Join("fuzz", ctx.Target().Arch.ArchType.String())
fuzz.binaryDecorator.baseInstaller.install(ctx, file)
}
func NewFuzz(hod android.HostOrDeviceSupported) *Module {
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()
module.sanitize.SetSanitizer(fuzzer, true)