diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-23 00:09:38 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-23 00:09:38 +0000 |
| commit | aff67b6bbc28eba4d1f4a4a12e116e63ab4813ea (patch) | |
| tree | b7892405559e1714c330ffb8ac9de9104296f4e3 /pw_toolchain/host_clang/toolchains.gni | |
| parent | 13960e09d00c4e8612da0a9084e0e051603f072b (diff) | |
| parent | f054515492af5132f685cb23fe11891ee77104c9 (diff) | |
| download | pigweed-android14-qpr2-s3-release.tar.gz | |
Snap for 11135477 from f054515492af5132f685cb23fe11891ee77104c9 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: I018123259cd231d0e74933e492391999e36650e8
Diffstat (limited to 'pw_toolchain/host_clang/toolchains.gni')
| -rw-r--r-- | pw_toolchain/host_clang/toolchains.gni | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pw_toolchain/host_clang/toolchains.gni b/pw_toolchain/host_clang/toolchains.gni index e148c86e1..3ee4c4fed 100644 --- a/pw_toolchain/host_clang/toolchains.gni +++ b/pw_toolchain/host_clang/toolchains.gni @@ -14,6 +14,7 @@ import("//build_overrides/pigweed.gni") +import("$dir_pw_build/defaults.gni") import("$dir_pw_toolchain/clang_tools.gni") declare_args() { @@ -58,11 +59,11 @@ _defaults = { # TODO: b/234888755 - amend toolchain declaration process to # remove this hack. default_configs = [] - default_configs = [ - "$dir_pw_build:extra_debugging", - "$dir_pw_toolchain/host_clang:no_system_libcpp", - "$dir_pw_toolchain/host_clang:xcode_sysroot", - ] + default_configs = pigweed_default_configs + [ + "$dir_pw_build:extra_debugging", + "$dir_pw_toolchain/host_clang:no_system_libcpp", + "$dir_pw_toolchain/host_clang:xcode_sysroot", + ] # OSS-Fuzz uses -stdlib=libc++, which isn't included in the CIPD-provided # Linux sysroot (it instead provides libstdc++). @@ -141,9 +142,9 @@ pw_toolchain_host_clang = { pw_toolchain_FUZZING_ENABLED = true if (pw_toolchain_OSS_FUZZ_ENABLED) { - default_configs += [ "$dir_pw_fuzzer:fuzz_instrumentation" ] - } else { default_configs += [ "$dir_pw_fuzzer:oss_fuzz_instrumentation" ] + } else { + default_configs += [ "$dir_pw_fuzzer:instrumentation" ] } # Fuzz faster. |