Update local master

.github/workflows/cirque.yaml

@@ -43,7 +43,9 @@ jobs:
                   submodules: true
             - name: Bootstrap
               run: |
-                  integrations/docker/images/chip-build-cirque/run.sh scripts/tests/cirque_tests.sh bootstrap
+                  integrations/docker/images/chip-build-cirque/run.sh \
+                    --env GITHUB_ACTION_RUN=1 \
+                    -- scripts/tests/cirque_tests.sh bootstrap
             - name: Artifact suffix
               id: outsuffix
               uses: haya14busa/[email protected]

BUILD.gn

@@ -138,7 +138,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     enable_android_builds = false
 
     # Set this to true to enable TI builds by default.
-    enable_cc13x2_26x2_builds = false
+    enable_ti_simplelink_builds = false
 
     # Set this to true to enable efr32 builds by default.
     enable_efr32_builds = false
@@ -179,8 +179,8 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     enable_linux_lighting_app_build =
         enable_default_builds && (host_os == "linux" || host_os == "mac")
 
-    # Build the cc13x2_26x2 lock app example.
-    enable_cc13x2_26x2_lock_app_build = enable_cc13x2_26x2_builds
+    # Build the cc13x2x7_26x2x7 lock app example.
+    enable_cc13x2x7_26x2x7_lock_app_build = enable_ti_simplelink_builds
 
     # Build the efr32 lock app example.
     enable_efr32_lock_app_build = enable_efr32_builds
@@ -240,9 +240,9 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     }
   }
 
-  if (enable_cc13x2_26x2_lock_app_build) {
-    group("cc13x2_26x2_lock_app") {
-      deps = [ "${chip_root}/examples/lock-app/cc13x2_26x2(${chip_root}/config/cc13x2_26x2/toolchain:cc13x2_26x2_lock_app)" ]
+  if (enable_cc13x2x7_26x2x7_lock_app_build) {
+    group("cc13x2x7_26x2x7_lock_app") {
+      deps = [ "${chip_root}/examples/lock-app/cc13x2x7_26x2x7(${chip_root}/config/cc13x2_26x2/toolchain:cc13x2x7_26x2x7_lock_app)" ]
     }
   }
 
@@ -346,8 +346,8 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     if (enable_qpg6100_lock_app_build) {
       deps += [ ":qpg6100_lock_app" ]
     }
-    if (enable_cc13x2_26x2_lock_app_build) {
-      deps += [ ":cc13x2_26x2_lock_app" ]
+    if (enable_cc13x2x7_26x2x7_lock_app_build) {
+      deps += [ ":cc13x2x7_26x2x7_lock_app" ]
     }
   }
 

build/chip/write_buildconfig_header.py

@@ -114,7 +114,7 @@ def GetOptions():
 
 def WriteHeader(options):
   with open(options.output, 'w') as output_file:
-    output_file.write("// Generated by gn/chip/write_buildconfig_header.py\n")
+    output_file.write("// Generated by write_buildconfig_header.py\n")
     if options.rulename:
       output_file.write('// From "' + options.rulename + '"\n')
 

config/cc13x2_26x2/toolchain/BUILD.gn

@@ -17,9 +17,9 @@ import("//build_overrides/chip.gni")
 
 import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni")
 
-arm_toolchain("cc13x2_26x2_lock_app") {
+arm_toolchain("cc13x2x7_26x2x7_lock_app") {
   toolchain_args = {
     current_os = "freertos"
-    import("${chip_root}/examples/lock-app/cc13x2_26x2/args.gni")
+    import("${chip_root}/examples/lock-app/cc13x2x7_26x2x7/args.gni")
   }
 }

config/esp32/components/chip/component.mk

@@ -125,6 +125,9 @@ install-chip : $(OUTPUT_DIR)
 	echo esp32_cc = \"$(CC)\"                >> $(OUTPUT_DIR)/args.gn
 	echo esp32_cxx = \"$(CXX)\"              >> $(OUTPUT_DIR)/args.gn
 	echo esp32_cpu = \"esp32\"               >> $(OUTPUT_DIR)/args.gn
+ifeq ($(is_debug),false)
+	@echo "is_debug = false" >> $(OUTPUT_DIR)/args.gn
+endif
 	if [[ "$(CONFIG_ENABLE_PW_RPC)" = "y" ]]; then                        \
 	  echo "chip_build_pw_rpc_lib = true" >> $(OUTPUT_DIR)/args.gn       ;\
 	  echo "pw_log_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"" >> $(OUTPUT_DIR)/args.gn     ;\

examples/all-clusters-app/all-clusters-common/BUILD.gn

@@ -27,6 +27,7 @@ source_set("all-clusters-common") {
     "${chip_root}/src/app/clusters/basic/basic.cpp",
     "${chip_root}/src/app/clusters/bindings/bindings.cpp",
     "${chip_root}/src/app/clusters/color-control-server/color-control-server.cpp",
+    "${chip_root}/src/app/clusters/content-launch-server/content-launch-server.cpp",
     "${chip_root}/src/app/clusters/door-lock-server/door-lock-server-core.cpp",
     "${chip_root}/src/app/clusters/door-lock-server/door-lock-server-logging.cpp",
     "${chip_root}/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp",