Merge remote-tracking branch 'upstream/master' into camera-webrtc-pro…

…vider

.github/workflows/darwin.yaml

@@ -111,8 +111,7 @@ jobs:
               working-directory: src/darwin/Framework
               run: |
                   mkdir -p /tmp/darwin/framework-tests
-                  echo "This is a simple log" > /tmp/darwin/framework-tests/end_user_support_log.txt
-                  ../../../out/debug/all-clusters-app/chip-all-clusters-app --interface-id -1 --end_user_support_log /tmp/darwin/framework-tests/end_user_support_log.txt > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
+                  ../../../out/debug/all-clusters-app/chip-all-clusters-app --interface-id -1 > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
 
                   export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
 

.github/workflows/docker_img.yaml

@@ -101,7 +101,7 @@ jobs:
                     # ApplyLayer exit status 1 stdout:  stderr: write /opt/fsl-imx-xwayland/5.15-kirkstone/sysroots/armv8a-poky-linux/opt/ltp/testcases/bin/fanotify15: no space left on device
                     # - "-imx"
                     - "-java"
-                    - "-k32w"
+                    - "-nxp"
                     - "-nrf-platform"
                     - "-telink"
                     - "-ti"

.github/workflows/examples-nxp.yaml

@@ -39,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-k32w:80
+            image: ghcr.io/project-chip/chip-build-nxp:80
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

.pullapprove.yml

@@ -84,79 +84,79 @@ groups:
         reviewers:
             teams: [reviewers-amazon]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-apple:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-apple]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-bosch:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-bosch]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-comcast:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-comcast]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-dyson:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-dyson]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-espressif:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-espressif]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-google:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-google]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-grundfos:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-grundfos]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-irobot:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-irobot]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-lg:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-lg]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-logitech:
         type: optional
         conditions:
@@ -172,31 +172,31 @@ groups:
         reviewers:
             teams: [reviewers-nordic]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-nxp:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-nxp]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-samsung:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-samsung]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-eve:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-eve]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     # shared-reviewers-signify disabled for now, because the reviewers-signify
     # team is empty and pullapprove seems to mis-handle that badly and treats
     # _all_ reviewers as being in this group.
@@ -210,39 +210,39 @@ groups:
     #     reviewers:
     #         teams: [reviewers-signify]
     #     reviews:
-    #         request: 10
+    #         request: 0 # Do not auto-add
     shared-reviewers-silabs:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-silabs]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-somfy:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-somfy]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-tcl:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-tcl]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
     shared-reviewers-qorvo:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-qorvo]
         reviews:
-            request: 10
+            request: 0 # Do not auto-add
 
     ############################################################
     #  Base Required Reviewers

CODEOWNERS

@@ -0,0 +1,71 @@
+/src/platform/ASR/               @tx2rx
+asr/                             @tx2rx
+chip-build-asr/                  @tx2rx
+
+/src/platform/Ameba/             @pankore
+ameba/                           @pankore
+chip-build-ameba/                @pankore
+
+/src/platform/Beken/             @zhengyaohan
+
+*.mm                             @project-chip/reviewers-apple
+darwin/                          @project-chip/reviewers-apple
+/src/darwin/                     @project-chip/reviewers-apple
+/src/platform/Darwin/            @project-chip/reviewers-apple
+/examples/darwin-framework-tool/ @project-chip/reviewers-apple
+
+/src/platform/ESP32/             @project-chip/reviewers-espressif
+esp32/                           @project-chip/reviewers-espressif
+chip-build-esp32/                @project-chip/reviewers-espressif
+chip-build-esp32-qemu/           @project-chip/reviewers-espressif
+
+/src/platform/Infineon/          @ifyall
+infineon/                        @ifyall
+chip-build-infineon/             @ifyall
+
+/src/platform/NuttX/             @zhhyu7
+chip-build-nuttx/                @zhhyu7
+
+/src/platform/Tizen/             @arkq
+tizen/                           @arkq
+chip-build-tizen/                @arkq
+chip-build-tizen-qemu/           @arkq
+
+*.java                           @project-chip/reviewers-google
+*.kt                             @project-chip/reviewers-google
+android/                         @project-chip/reviewers-google
+/src/examples/chef/              @project-chip/reviewers-google
+/integrations/appengine/         @project-chip/reviewers-google
+/integrations/cloudbuild/        @project-chip/reviewers-google
+/integrations/compute_engine/    @project-chip/reviewers-google
+chip-build-java/                 @project-chip/reviewers-google
+chip-build-android/              @project-chip/reviewers-google
+
+/src/platform/bouffalolab/       @wy-hh
+chip-build-bouffalolab/          @wy-hh
+
+cc13xx_26xx/                     @s-jain2022
+cc32xx/                          @s-jain2022
+
+/src/platform/mt793x/            @pakls
+nrfconnect/                      @project-chip/reviewers-nordic
+chip-build-nrf-platform/                      @project-chip/reviewers-nordic
+Zephyr/                            @project-chip/reviewers-nordic @project-chip/reviewers-nxp @s07641069
+
+
+nxp/                             @project-chip/reviewers-nxp
+chip-build-nxp/                  @project-chip/reviewers-nxp
+chip-build-nxp-zephyr/           @project-chip/reviewers-nxp
+chip-build-k32w/                 @project-chip/reviewers-nxp
+
+qpg/                             @dvdm-qorvo
+
+silabs/                          @project-chip/reviewers-silabs
+chip-build-efr32/                @project-chip/reviewers-silabs
+
+stm32/                           @STYoannZamaron
+
+telink/                          @s07641069
+chip-build-telink/               @s07641069
+
+webos/                           @joonhaengHeo

build/config/compiler/BUILD.gn

@@ -24,10 +24,40 @@ if (current_os == "mac" || current_os == "ios") {
   import("${build_root}/config/mac/mac_sdk.gni")
 }
 
+# To use different sanitizer options, use `gn args .` in the out folder and
+# use settings like:
+#
+#   is_clang=true
+#   is_debug=true
+#   optimize_for_size=false
+#   is_asan=true
+#   is_sanitize_fatal=false
+#
+
 declare_args() {
   # Enable -Werror. This can be disabled if using a different compiler
   # with unfixed or unsupported wanings.
   treat_warnings_as_errors = true
+
+  # Enable Thread sanitizer
+  is_tsan = false
+
+  # Enable memory sanitizer
+  is_msan = false
+
+  # enable undefined behavior sanitizer
+  is_ubsan = false
+
+  # Exit on sanitize error. Generally standard libraries may get errors
+  # so not stopping on the first error is often useful
+  is_sanitize_fatal = true
+
+  # Enable or disable Runtime Type Information (RTTI).
+  # Defaults true on darwin because Darwin.framework uses it.
+  enable_rtti = current_os == "mac" || current_os == "ios"
+
+  # Enable or disable support for C++ exceptions.
+  enable_exceptions = false
 }
 
 if (current_cpu == "arm" || current_cpu == "arm64") {
@@ -397,21 +427,6 @@ config("runtime_default") {
 #   is_sanitize_fatal=false
 #
 
-declare_args() {
-  # Enable Thread sanitizer
-  is_tsan = false
-
-  # Enable memory sanitizer
-  is_msan = false
-
-  # enable undefined behavior sanitizer
-  is_ubsan = false
-
-  # Exit on sanitize error. Generally standard libraries may get errors
-  # so not stopping on the first error is often useful
-  is_sanitize_fatal = true
-}
-
 config("sanitize_address") {
   defines = []
   cflags = [
@@ -452,10 +467,14 @@ config("sanitize_undefined_behavior") {
       "-fsanitize=unsigned-integer-overflow",
       "-fsanitize=implicit-conversion",
       "-fsanitize=nullability",
-      "-fno-sanitize=vptr,function",
     ]
   }
 
+  #According to the LLVM UBSan documentation, sanitizing vptr is incompatible with the -fno-rtti flag.
+  if (!enable_rtti) {
+    cflags += [ "-fno-sanitize=vptr" ]
+  }
+
   ldflags = cflags
 }
 
@@ -522,15 +541,6 @@ config("coverage_default") {
   }
 }
 
-declare_args() {
-  # Enable or disable Runtime Type Information (RTTI).
-  # Defaults true on darwin because Darwin.framework uses it.
-  enable_rtti = current_os == "mac" || current_os == "ios"
-
-  # Enable or disable support for C++ exceptions.
-  enable_exceptions = false
-}
-
 config("no_rtti") {
   cflags_cc = [ "-fno-rtti" ]
 }

data_model/in_progress/clusters/BasicInformationCluster.xml → data_model/1.4/clusters/BasicInformationCluster.xml

@@ -60,7 +60,7 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added ProductAppearance attribute"/>
     <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
-    <revision revision="4" summary="Updated conformance for UniqueID to mandatory. Added DeviceLocation attribute."/>
+    <revision revision="4" summary="Updated conformance for UniqueID to mandatory."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0028" name="Basic Information"/>
@@ -303,11 +303,6 @@ Davis, CA 95616, USA
       <mandatoryConform/>
       <constraint type="min" value="1"/>
     </attribute>
-    <attribute id="0x0017" name="DeviceLocation" type="locationdesc" default="MS">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform/>
-    </attribute>
   </attributes>
   <events>
     <event id="0x00" name="StartUp" priority="critical">

data_model/in_progress/clusters/CommissionerControlCluster.xml → data_model/1.4/clusters/CommissionerControlCluster.xml

@@ -116,7 +116,7 @@ Davis, CA 95616, USA
       </field>
       <field id="2" name="Discriminator" type="uint16">
         <mandatoryConform/>
-        <constraint type="between" from="0" to="4095"/>
+        <constraint type="max" value="4095"/>
       </field>
       <field id="3" name="Iterations" type="uint32">
         <mandatoryConform/>