Changes needed to run on OSS-Fuzz.
Bump libunwindstack to build with system libc++.
Bug: 69150303
Change-Id: I6a4fae6bb201f0e2164a6d04ad116f1b61e3bf0f
diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn
index 863b972..7c1e56d 100644
--- a/gn/standalone/BUILD.gn
+++ b/gn/standalone/BUILD.gn
@@ -191,7 +191,7 @@
]
if (is_android) {
cflags += [ "-Oz" ]
- } else if (use_libfuzzer) {
+ } else if (is_fuzzer) {
cflags += [ "-O1" ]
} else {
cflags += [ "-O3" ]
diff --git a/gn/standalone/BUILDCONFIG.gn b/gn/standalone/BUILDCONFIG.gn
index d634c3f..773f87d 100644
--- a/gn/standalone/BUILDCONFIG.gn
+++ b/gn/standalone/BUILDCONFIG.gn
@@ -15,7 +15,12 @@
declare_args() {
is_debug = true
is_clang = true
+ is_system_compiler = false
is_lto = false
+
+ extra_cflags = ""
+ extra_cxxflags = ""
+ extra_ldflags = ""
}
declare_args() {
diff --git a/gn/standalone/fuzzer.gni b/gn/standalone/fuzzer.gni
index 4a2ae14..c6e3ed5 100644
--- a/gn/standalone/fuzzer.gni
+++ b/gn/standalone/fuzzer.gni
@@ -17,9 +17,13 @@
template("perfetto_fuzzer_test") {
forward_variables_from(invoker, "*")
- if (use_libfuzzer) {
+ if (is_fuzzer) {
executable(target_name) {
- deps += [ "//buildtools:libfuzzer" ]
+ if (use_libfuzzer) {
+ deps += [ "//buildtools:libfuzzer" ]
+ } else {
+ ldflags = [ link_fuzzer ]
+ }
}
} else {
not_needed(invoker, "*")
diff --git a/gn/standalone/sanitizers/BUILD.gn b/gn/standalone/sanitizers/BUILD.gn
index 31718f2..b0cbf13 100644
--- a/gn/standalone/sanitizers/BUILD.gn
+++ b/gn/standalone/sanitizers/BUILD.gn
@@ -87,7 +87,7 @@
]
defines += [ "UNDEFINED_SANITIZER" ]
}
- if (use_libfuzzer) {
+ if (is_fuzzer) {
cflags += [ "-fsanitize=fuzzer-no-link" ]
if (is_asan) {
cflags += [
diff --git a/gn/standalone/sanitizers/vars.gni b/gn/standalone/sanitizers/vars.gni
index d1f2760..32613d1 100644
--- a/gn/standalone/sanitizers/vars.gni
+++ b/gn/standalone/sanitizers/vars.gni
@@ -28,8 +28,17 @@
# Undefined Behaviour Sanitizer.
is_ubsan = false
- # # Compile for fuzzing with LLVM LibFuzzer.
- use_libfuzzer = false
+ # Compile for fuzzing.
+ is_fuzzer = false
+}
+
+declare_args() {
+ # Link in LLVM LibFuzzer.
+ use_libfuzzer = is_fuzzer
+
+ # If is_fuzzer=true and use_libfuzzer=false, add this flag to ldflags when
+ # linking fuzzer executables.
+ link_fuzzer = ""
}
declare_args() {
@@ -37,6 +46,8 @@
is_asan || is_lsan || is_tsan || is_msan || is_ubsan || use_libfuzzer
}
-assert(!using_sanitizer || is_clang, "is_*san requires is_clang=true'")
+assert(!using_sanitizer || is_clang || is_system_compiler,
+ "is_*san requires is_clang=true'")
assert(!is_msan || is_linux, "msan only supported on linux")
assert(!is_tsan || (is_linux || is_mac), "tsan only supported on linux and mac")
+assert(!is_fuzzer || use_libfuzzer || link_fuzzer != "")
diff --git a/gn/standalone/toolchain/BUILD.gn b/gn/standalone/toolchain/BUILD.gn
index 9f4e983..1ffb94f 100644
--- a/gn/standalone/toolchain/BUILD.gn
+++ b/gn/standalone/toolchain/BUILD.gn
@@ -18,7 +18,10 @@
declare_args() {
if (is_clang) {
- if (is_linux) {
+ if (is_system_compiler) {
+ cc = "\$CC "
+ cxx = "\$CXX "
+ } else if (is_linux) {
cc = linux_clang_bin
cxx = linux_clangxx_bin
} else {
@@ -66,7 +69,7 @@
tool("cc") {
depfile = "{{output}}.d"
- command = "$cc_wrapper $cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
+ command = "$cc_wrapper $cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} ${extra_cflags} -c {{source}} -o {{output}}"
depsformat = "gcc"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
@@ -76,7 +79,7 @@
tool("cxx") {
depfile = "{{output}}.d"
- command = "$cc_wrapper $cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}"
+ command = "$cc_wrapper $cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} ${extra_cflags} ${extra_cxxflags} -c {{source}} -o {{output}}"
depsformat = "gcc"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
@@ -118,7 +121,7 @@
rpath = "-Wl,-install_name,@rpath/$soname"
}
- command = "$cc_wrapper $cxx -shared {{ldflags}} {{inputs}} {{solibs}} {{libs}} $rpath -o {{output}}"
+ command = "$cc_wrapper $cxx -shared {{ldflags}} ${extra_ldflags} {{inputs}} {{solibs}} {{libs}} $rpath -o {{output}}"
outputs = [
"{{root_out_dir}}/$soname",
]
@@ -128,7 +131,7 @@
}
tool("link") {
- command = "$cc_wrapper $cxx {{ldflags}} {{inputs}} {{solibs}} {{libs}} -o {{output}}"
+ command = "$cc_wrapper $cxx {{ldflags}} ${extra_ldflags} {{inputs}} {{solibs}} {{libs}} -o {{output}}"
outputs = [
"{{root_out_dir}}/{{target_output_name}}{{output_extension}}",
]
