File tree 18 files changed +3
-51
lines changed
all-clusters-minimal-app/linux
18 files changed +3
-51
lines changed Original file line number Diff line number Diff line change @@ -43,7 +43,8 @@ declare_args() {
43
43
c_standard = " gnu11"
44
44
45
45
# 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" ) {
47
48
cpp_standard = " gnu++17"
48
49
} else {
49
50
cpp_standard = " gnu++14"
Original file line number Diff line number Diff line change @@ -27,6 +27,3 @@ chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
27
27
matter_enable_tracing_support = true
28
28
matter_log_json_payload_decode_full = true
29
29
matter_log_json_payload_hex = true
30
-
31
- # Perfetto requires C++17
32
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -25,6 +25,3 @@ chip_project_config_include_dirs =
25
25
chip_project_config_include_dirs += [ " ${ chip_root } /config/standalone" ]
26
26
27
27
matter_enable_tracing_support = true
28
-
29
- # Perfetto requires C++17
30
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -25,6 +25,3 @@ chip_project_config_include_dirs =
25
25
chip_project_config_include_dirs += [ " ${ chip_root } /config/standalone" ]
26
26
27
27
matter_enable_tracing_support = true
28
-
29
- # Perfetto requires C++17
30
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -21,8 +21,6 @@ import("${chip_root}/config/standalone/args.gni")
21
21
22
22
import (" //build_overrides/pigweed.gni" )
23
23
24
- cpp_standard = " gnu++17"
25
-
26
24
pw_log_BACKEND = " $dir_pw_log_basic "
27
25
pw_assert_BACKEND = " $dir_pw_assert_log :check_backend"
28
26
pw_sys_io_BACKEND = " $dir_pw_sys_io_stdio "
Original file line number Diff line number Diff line change @@ -26,6 +26,3 @@ chip_project_config_include_dirs =
26
26
[ " ${ chip_root } /examples/contact-sensor-app/linux/include" ]
27
27
chip_project_config_include_dirs += [ " ${ chip_root } /config/standalone" ]
28
28
matter_enable_tracing_support = true
29
-
30
- # Perfetto requires C++17
31
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -27,6 +27,3 @@ chip_project_config_include_dirs =
27
27
chip_project_config_include_dirs += [ " ${ chip_root } /config/standalone" ]
28
28
29
29
matter_enable_tracing_support = true
30
-
31
- # Perfetto requires C++17
32
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -21,8 +21,6 @@ import("${chip_root}/config/standalone/args.gni")
21
21
22
22
import (" //build_overrides/pigweed.gni" )
23
23
24
- cpp_standard = " gnu++17"
25
-
26
24
pw_log_BACKEND = " $dir_pw_log_basic "
27
25
pw_assert_BACKEND = " $dir_pw_assert_log :check_backend"
28
26
pw_sys_io_BACKEND = " $dir_pw_sys_io_stdio "
Original file line number Diff line number Diff line change @@ -24,6 +24,3 @@ chip_project_config_include_dirs =
24
24
[ " ${ chip_root } /examples/lock-app/linux/include" ]
25
25
chip_project_config_include_dirs += [ " ${ chip_root } /config/standalone" ]
26
26
matter_enable_tracing_support = true
27
-
28
- # Perfetto requires C++17
29
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -17,6 +17,3 @@ import("//build_overrides/chip.gni")
17
17
import (" ${ chip_root } /config/standalone/args.gni" )
18
18
19
19
matter_enable_tracing_support = true
20
-
21
- # Perfetto requires C++17
22
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -24,6 +24,3 @@ chip_project_config_include_dirs =
24
24
[ " ${ chip_root } /examples/ota-provider-app/linux/include" ]
25
25
chip_project_config_include_dirs += [ " ${ chip_root } /config/standalone" ]
26
26
matter_enable_tracing_support = true
27
-
28
- # Perfetto requires C++17
29
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -26,6 +26,3 @@ chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
26
26
27
27
chip_enable_ota_requestor = true
28
28
matter_enable_tracing_support = true
29
-
30
- # Perfetto requires C++17
31
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -16,6 +16,3 @@ import("//build_overrides/chip.gni")
16
16
17
17
import (" ${ chip_root } /config/standalone/args.gni" )
18
18
matter_enable_tracing_support = true
19
-
20
- # Perfetto requires C++17
21
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -23,6 +23,3 @@ chip_project_config_include_dirs =
23
23
[ " ${ chip_root } /examples/placeholder/linux/include" ]
24
24
chip_project_config_include_dirs += [ " ${ chip_root } /config/standalone" ]
25
25
matter_enable_tracing_support = true
26
-
27
- # Perfetto requires C++17
28
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -16,6 +16,3 @@ import("//build_overrides/chip.gni")
16
16
17
17
import (" ${ chip_root } /config/standalone/args.gni" )
18
18
matter_enable_tracing_support = true
19
-
20
- # Perfetto requires C++17
21
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -31,6 +31,3 @@ chip_enable_additional_data_advertising = true
31
31
chip_enable_rotating_device_id = true
32
32
33
33
matter_enable_tracing_support = true
34
-
35
- # Perfetto requires C++17
36
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -33,6 +33,3 @@ chip_enable_rotating_device_id = true
33
33
chip_max_discovered_ip_addresses = 20
34
34
35
35
matter_enable_tracing_support = true
36
-
37
- # Perfetto requires C++17
38
- cpp_standard = " gnu++17"
Original file line number Diff line number Diff line change @@ -43,10 +43,7 @@ declare_args() {
43
43
# since tracing is very noisy, we generally expect it to be explicitly
44
44
# set up.
45
45
#
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" ) {
50
47
matter_trace_config = " ${ chip_root } /src/tracing/perfetto:perfetto_tracing"
51
48
} else {
52
49
matter_trace_config = " ${ chip_root } /src/tracing/none"
You can’t perform that action at this time.
0 commit comments