Skip to content

Commit 3df57b7

Browse files
andy31415andreilitvinbzbarsky-applerestyled-commits
authored
Start switching platforms to C++17 (linux, mac) (project-chip#28170)
* Switch linux, mac, android to C++17 by default * Update build/config/compiler/compiler.gni Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Restyled by gn --------- Co-authored-by: Andrei Litvin <andreilitvin@google.com> Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 3c253bb commit 3df57b7

File tree

18 files changed

+3
-51
lines changed

18 files changed

+3
-51
lines changed

build/config/compiler/compiler.gni

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ declare_args() {
4343
c_standard = "gnu11"
4444

4545
# C++ standard level (value for -std flag).
46-
if (current_os == "android") {
46+
if (current_os == "linux" || current_os == "mac" || current_os == "ios" ||
47+
current_os == "android") {
4748
cpp_standard = "gnu++17"
4849
} else {
4950
cpp_standard = "gnu++14"

examples/all-clusters-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,3 @@ chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
2727
matter_enable_tracing_support = true
2828
matter_log_json_payload_decode_full = true
2929
matter_log_json_payload_hex = true
30-
31-
# Perfetto requires C++17
32-
cpp_standard = "gnu++17"

examples/all-clusters-minimal-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,3 @@ chip_project_config_include_dirs =
2525
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
2626

2727
matter_enable_tracing_support = true
28-
29-
# Perfetto requires C++17
30-
cpp_standard = "gnu++17"

examples/bridge-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,3 @@ chip_project_config_include_dirs =
2525
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
2626

2727
matter_enable_tracing_support = true
28-
29-
# Perfetto requires C++17
30-
cpp_standard = "gnu++17"

examples/chef/linux/with_pw_rpc.gni

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import("${chip_root}/config/standalone/args.gni")
2121

2222
import("//build_overrides/pigweed.gni")
2323

24-
cpp_standard = "gnu++17"
25-
2624
pw_log_BACKEND = "$dir_pw_log_basic"
2725
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
2826
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"

examples/contact-sensor-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,3 @@ chip_project_config_include_dirs =
2626
[ "${chip_root}/examples/contact-sensor-app/linux/include" ]
2727
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
2828
matter_enable_tracing_support = true
29-
30-
# Perfetto requires C++17
31-
cpp_standard = "gnu++17"

examples/lighting-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,3 @@ chip_project_config_include_dirs =
2727
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
2828

2929
matter_enable_tracing_support = true
30-
31-
# Perfetto requires C++17
32-
cpp_standard = "gnu++17"

examples/lighting-app/linux/with_pw_rpc.gni

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import("${chip_root}/config/standalone/args.gni")
2121

2222
import("//build_overrides/pigweed.gni")
2323

24-
cpp_standard = "gnu++17"
25-
2624
pw_log_BACKEND = "$dir_pw_log_basic"
2725
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
2826
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"

examples/lock-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,3 @@ chip_project_config_include_dirs =
2424
[ "${chip_root}/examples/lock-app/linux/include" ]
2525
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
2626
matter_enable_tracing_support = true
27-
28-
# Perfetto requires C++17
29-
cpp_standard = "gnu++17"

examples/log-source-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,3 @@ import("//build_overrides/chip.gni")
1717
import("${chip_root}/config/standalone/args.gni")
1818

1919
matter_enable_tracing_support = true
20-
21-
# Perfetto requires C++17
22-
cpp_standard = "gnu++17"

examples/ota-provider-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,3 @@ chip_project_config_include_dirs =
2424
[ "${chip_root}/examples/ota-provider-app/linux/include" ]
2525
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
2626
matter_enable_tracing_support = true
27-
28-
# Perfetto requires C++17
29-
cpp_standard = "gnu++17"

examples/ota-requestor-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,3 @@ chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
2626

2727
chip_enable_ota_requestor = true
2828
matter_enable_tracing_support = true
29-
30-
# Perfetto requires C++17
31-
cpp_standard = "gnu++17"

examples/persistent-storage/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ import("//build_overrides/chip.gni")
1616

1717
import("${chip_root}/config/standalone/args.gni")
1818
matter_enable_tracing_support = true
19-
20-
# Perfetto requires C++17
21-
cpp_standard = "gnu++17"

examples/placeholder/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,3 @@ chip_project_config_include_dirs =
2323
[ "${chip_root}/examples/placeholder/linux/include" ]
2424
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
2525
matter_enable_tracing_support = true
26-
27-
# Perfetto requires C++17
28-
cpp_standard = "gnu++17"

examples/thermostat/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ import("//build_overrides/chip.gni")
1616

1717
import("${chip_root}/config/standalone/args.gni")
1818
matter_enable_tracing_support = true
19-
20-
# Perfetto requires C++17
21-
cpp_standard = "gnu++17"

examples/tv-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,3 @@ chip_enable_additional_data_advertising = true
3131
chip_enable_rotating_device_id = true
3232

3333
matter_enable_tracing_support = true
34-
35-
# Perfetto requires C++17
36-
cpp_standard = "gnu++17"

examples/tv-casting-app/linux/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,3 @@ chip_enable_rotating_device_id = true
3333
chip_max_discovered_ip_addresses = 20
3434

3535
matter_enable_tracing_support = true
36-
37-
# Perfetto requires C++17
38-
cpp_standard = "gnu++17"

src/tracing/tracing_args.gni

+1-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ declare_args() {
4343
# since tracing is very noisy, we generally expect it to be explicitly
4444
# set up.
4545
#
46-
# TODO: cpp_standard check is not ideal, it should be >= 17,
47-
# however for now this is what we use in compilations
48-
if ((current_os == "linux" || current_os == "android") &&
49-
cpp_standard == "gnu++17") {
46+
if (current_os == "linux" || current_os == "android") {
5047
matter_trace_config = "${chip_root}/src/tracing/perfetto:perfetto_tracing"
5148
} else {
5249
matter_trace_config = "${chip_root}/src/tracing/none"

0 commit comments

Comments
 (0)