Enable tracing on linux using a different logic - all linux builds ha…

…ve tracing by default
project-chip · Jun 8, 2023 · 2114451 · 2114451
1 parent c9ed837
commit 2114451
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 21 deletions.
diff --git a/examples/all-clusters-app/linux/args.gni b/examples/all-clusters-app/linux/args.gni
@@ -23,5 +23,3 @@ chip_system_project_config_include = "<SystemProjectConfig.h>"
 chip_project_config_include_dirs =
     [ "${chip_root}/examples/all-clusters-app/linux/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
-
-matter_enable_tracing_support = true
diff --git a/examples/all-clusters-minimal-app/linux/args.gni b/examples/all-clusters-minimal-app/linux/args.gni
@@ -23,5 +23,3 @@ chip_system_project_config_include = "<SystemProjectConfig.h>"
 chip_project_config_include_dirs =
     [ "${chip_root}/examples/all-clusters-minimal-app/linux/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
-
-matter_enable_tracing_support = true
diff --git a/examples/bridge-app/linux/args.gni b/examples/bridge-app/linux/args.gni
@@ -23,5 +23,3 @@ chip_system_project_config_include = "<SystemProjectConfig.h>"
 chip_project_config_include_dirs =
     [ "${chip_root}/examples/bridge-app/bridge-common/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
-
-matter_enable_tracing_support = true
diff --git a/examples/contact-sensor-app/linux/args.gni b/examples/contact-sensor-app/linux/args.gni
@@ -25,5 +25,3 @@ chip_system_project_config_include = "<SystemProjectConfig.h>"
 chip_project_config_include_dirs =
     [ "${chip_root}/examples/contact-sensor-app/linux/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
-
-matter_enable_tracing_support = true
diff --git a/examples/lighting-app/linux/args.gni b/examples/lighting-app/linux/args.gni
@@ -25,5 +25,3 @@ chip_system_project_config_include = "<SystemProjectConfig.h>"
 chip_project_config_include_dirs =
     [ "${chip_root}/examples/lighting-app/linux/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
-
-matter_enable_tracing_support = true
diff --git a/examples/lock-app/linux/args.gni b/examples/lock-app/linux/args.gni
@@ -23,5 +23,3 @@ chip_system_project_config_include = "<SystemProjectConfig.h>"
 chip_project_config_include_dirs =
     [ "${chip_root}/examples/all-clusters-app/linux/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
-
-matter_enable_tracing_support = true
diff --git a/examples/ota-provider-app/linux/args.gni b/examples/ota-provider-app/linux/args.gni
@@ -23,5 +23,3 @@ chip_system_project_config_include = "<SystemProjectConfig.h>"
 chip_project_config_include_dirs =
     [ "${chip_root}/examples/ota-provider-app/linux/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
-
-matter_enable_tracing_support = true
diff --git a/examples/ota-requestor-app/linux/args.gni b/examples/ota-requestor-app/linux/args.gni
@@ -25,4 +25,3 @@ chip_project_config_include_dirs =
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
 
 chip_enable_ota_requestor = true
-matter_enable_tracing_support = true
diff --git a/examples/persistent-storage/linux/args.gni b/examples/persistent-storage/linux/args.gni
@@ -15,4 +15,3 @@
 import("//build_overrides/chip.gni")
 
 import("${chip_root}/config/standalone/args.gni")
-matter_enable_tracing_support = true
diff --git a/examples/placeholder/linux/args.gni b/examples/placeholder/linux/args.gni
@@ -22,4 +22,3 @@ chip_project_config_include = "<CHIPProjectConfig.h>"
 chip_project_config_include_dirs =
     [ "${chip_root}/examples/placeholder/linux/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
-matter_enable_tracing_support = true
diff --git a/examples/thermostat/linux/args.gni b/examples/thermostat/linux/args.gni
@@ -15,4 +15,3 @@
 import("//build_overrides/chip.gni")
 
 import("${chip_root}/config/standalone/args.gni")
-matter_enable_tracing_support = true
diff --git a/examples/tv-app/linux/args.gni b/examples/tv-app/linux/args.gni
@@ -29,4 +29,3 @@ chip_build_libshell = true
 chip_enable_additional_data_advertising = true
 
 chip_enable_rotating_device_id = true
-matter_enable_tracing_support = true
diff --git a/examples/tv-casting-app/linux/args.gni b/examples/tv-casting-app/linux/args.gni
@@ -31,4 +31,3 @@ chip_enable_additional_data_advertising = true
 chip_enable_rotating_device_id = true
 
 chip_max_discovered_ip_addresses = 20
-matter_enable_tracing_support = true
diff --git a/src/tracing/tracing_args.gni b/src/tracing/tracing_args.gni
@@ -16,5 +16,5 @@ declare_args() {
   # Tracing can have a non-zero size impact to binaries. We try to make
   # the impact minimal (the backends themselves add some size), however
   # for now tracing is opt-in
-  matter_enable_tracing_support = false
+  matter_enable_tracing_support = (target_os == "linux")
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,4 +25,3 @@ chip_project_config_include_dirs =
		chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]

		chip_enable_ota_requestor = true
		matter_enable_tracing_support = true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,3 @@
		import("//build_overrides/chip.gni")

		import("${chip_root}/config/standalone/args.gni")
		matter_enable_tracing_support = true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,4 +29,3 @@ chip_build_libshell = true
		chip_enable_additional_data_advertising = true

		chip_enable_rotating_device_id = true
		matter_enable_tracing_support = true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,3 @@ chip_enable_additional_data_advertising = true
		chip_enable_rotating_device_id = true

		chip_max_discovered_ip_addresses = 20
		matter_enable_tracing_support = true