tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "rust_fuzzer: add toolchain libraries if non-empty" am: d4a58377fd am: 91f877b495 am: aaf044b75b

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1673772

Change-Id: I9d61de00a0d66011bc26fefca79eec07c1cd7222
This commit is contained in:
Jingwen Chen 2021-04-13 04:32:33 +00:00 committed by Automerger Merge Worker
commit 64bf07c5aa
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rust/fuzz.go
View file

@ -70,10 +70,12 @@ func (fuzzer *fuzzDecorator) compilerFlags(ctx ModuleContext, flags Flags) Flags
}
func (fuzzer *fuzzDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps {
deps.StaticLibs = append(deps.StaticLibs,
config.LibFuzzerRuntimeLibrary(ctx.toolchain()))
deps.SharedLibs = append(deps.SharedLibs,
config.LibclangRuntimeLibrary(ctx.toolchain(), "asan"))
if libFuzzerRuntimeLibrary := config.LibFuzzerRuntimeLibrary(ctx.toolchain()); libFuzzerRuntimeLibrary != "" {
deps.StaticLibs = append(deps.StaticLibs, libFuzzerRuntimeLibrary)
}
if libclangRuntimeLibrary := config.LibclangRuntimeLibrary(ctx.toolchain(), "asan"); libclangRuntimeLibrary != "" {
deps.SharedLibs = append(deps.SharedLibs, libclangRuntimeLibrary)
}
deps.SharedLibs = append(deps.SharedLibs, "libc++")
deps.Rlibs = append(deps.Rlibs, "liblibfuzzer_sys")