chromium/src
0
Fork 0
Code Activity

Move use_cxx17 build flag from build/config/compiler to build_overrides

Browse Source 
WebRTC hasn't moved to C++20 yet, but we now need to use it when compiling Android due to the JNI generator depending on Chromium's //base which started using C++20 features. By moving the flag to build_overrides, we can conditionally set it based on target_os.

Bug:b/294976628, chromium:1402249

Change-Id: I6fc5a669cf9287cb2beb43873016c7560b399185
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4758705
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Björn Terelius <terelius@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1181536}
This commit is contained in:
Björn Terelius
2023-08-09 16:55:45 +00:00
committed by Chromium LUCI CQ
parent 7edc7ba910
commit d6dfe7b518
2 changed files with 4 additions and 4 deletions
build/config/compiler
BUILD.gn
build_overrides
build.gni

4
build/config/compiler/BUILD.gn

@ -175,10 +175,6 @@ declare_args() {
# a reproducer file to be saved.
save_reproducers_on_lld_crash = false
# Allow projects that wish to stay on C++17 to override Chromium's default.
# TODO(crbug.com/1402249): evaluate removing this end of 2023
use_cxx17 = false
# Enable ShadowCallStack for compiled binaries. SCS stores a pointer to a
# shadow call stack in register x18. Hence, x18 must not be used by the OS
# or libraries. We assume that to be the case for high end Android

4
build_overrides/build.gni

@ -53,6 +53,10 @@ declare_args() {
# Allows third-party repositories to use C++17 for MSVC builds
# TODO(https://crbug.com/pdfium/1932) Remove once pdfium builds on MSVC C++20
msvc_use_cxx17 = false
# Allow projects that wish to stay on C++17 to override Chromium's default.
# TODO(crbug.com/1402249): evaluate removing this end of 2023
use_cxx17 = false
}
# Features used by //base/trace_event.