Merge branch 'master' into feature/closure_control_cluster_xml_generation

Author: sabollim-silabs

.devcontainer/Dockerfile

@@ -54,24 +54,24 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
     && chmod +x /usr/local/bin/restyle-path \
     && :
 
-RUN mkdir -p /opt/sdk/sdks/ \
+RUN mkdir -p /opt/android/sdk \
     && chown -R $USERNAME:$USERNAME \
-    /opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
+    /opt/android/sdk `# NXP uses a patch_sdk script to change SDK files` \
     $ANDROID_HOME \
     $IDF_TOOLS_PATH \
     && find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
     && find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
     && find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
     && find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
     && chmod -R +x \
-    $ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
+    $ANDROID_HOME/cmdline-tools/10.0/bin `# sdkmanager for accepting licenses`\
     && chmod -R +w \
     $IDF_TOOLS_PATH \
     && find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
     && find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
     && find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
     && find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
-    # Safe directory is preffered over chown.
+    # Safe directory is preferred over chown.
     && git config --global --add safe.directory "*" \
     && :
 

.github/.wordlist.txt

@@ -49,6 +49,7 @@ amebad
 amebaiot
 AmebaZ
 amebaz2
+ANC
 announcementReason
 AnnounceOTAProvider
 AnnounceOTAProviderRequest
@@ -85,6 +86,7 @@ ASR
 AssertionError
 AST
 ASYNC
+ATL
 ATLs
 atomics
 att
@@ -114,6 +116,7 @@ avahi
 avL
 AwaitNextAction
 AXXXF
+Axxxx
 AYNJV
 babaf
 backend
@@ -507,6 +510,7 @@ entrypoint
 enum
 Enums
 env
+EP
 epochKey
 epochStartTime
 eq
@@ -538,6 +542,7 @@ ExtendedPAN
 ExtensionEntry
 extern
 extpanid
+Exx
 FabricId
 fabricIdx
 fabricIndex
@@ -585,6 +590,7 @@ fuzzer
 fuzzers
 fuzztest
 FW
+Fxx
 gbl
 gcloud
 GDB
@@ -684,6 +690,7 @@ ICMP
 IDF
 IDL
 IDLs
+IDM
 idt
 idx
 ifconfig
@@ -1235,6 +1242,7 @@ RPi's
 RPis
 RSA
 rsn
+Rsp
 RSSI
 RST
 rsync
@@ -1622,6 +1630,7 @@ xFFFF
 xfffff
 xFFFFFFEFFFFFFFFF
 XMLPICSValidator
+XMLs
 xtensa
 xvzf
 xwayland

.github/dependabot.yml

@@ -38,6 +38,7 @@ updates:
       - dependency-name: "third_party/java_deps/repo"
       - dependency-name: "third_party/jlink/repo"
       - dependency-name: "third_party/jsoncpp/repo"
+      - dependency-name: "third_party/libdatachannel/repo"
       - dependency-name: "third_party/libwebsockets/repo"
       - dependency-name: "third_party/lwip/repo"
       - dependency-name: "third_party/mbed-mcu-boot/repo"

.github/workflows/build.yaml

@@ -211,11 +211,16 @@ jobs:
             - name: Find changed files
               id: changed-files
               uses: tj-actions/changed-files@v45
+              with:
+                # Exclude all files under "third_party/"
+                files-ignore: |
+                  third_party/
+
             - name: Clang-tidy validation
               # NOTE: clang-tidy crashes on CodegenDataModel_Write due to Nullable/std::optional check.
               #       See https://github.com/llvm/llvm-project/issues/97426
               env:
-                  ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
+                  ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.changed_files }}
               run: |
                   touch out/changed_files.txt
                   for file in ${ALL_CHANGED_FILES}; do

.gitmodules

@@ -349,3 +349,8 @@
 	path = third_party/re2/src
 	url = https://github.com/google/re2.git
 	platforms = linux,darwin
+[submodule "third_party/libdatachannel/repo"]
+	path = third_party/libdatachannel/repo
+	url = https://github.com/paullouisageneau/libdatachannel.git
+	platforms = linux
+	recursive = true

.vscode/launch.json

@@ -4,6 +4,14 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Python Debugger: test_dcl_server",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "/workspace/connectedhomeip/examples/chip-tool/commands/dcl/test_dcl_server.py",
+            "args": [],
+            "console": "integratedTerminal"
+        },
         {
             "name": "Attach to running process",
             "type": "lldb",

build/chip/chip_test_suite.gni

@@ -18,8 +18,11 @@ import("//build_overrides/googletest.gni")
 import("//build_overrides/pigweed.gni")
 
 import("${chip_root}/build/chip/tests.gni")
+import("${dir_pw_build}/python.gni")
 import("${dir_pw_unit_test}/test.gni")
 
+# Need access to build options (specifically build_coverage)
+import("${build_root}/config/compiler/compiler.gni")
 assert(chip_build_tests)
 
 declare_args() {
@@ -112,6 +115,26 @@ template("chip_test_suite") {
           _test_output_dir = invoker.output_dir
         }
 
+        if (use_coverage && is_clang) {
+          # Generates clang coverage to "<TestName>.profraw" instead of "deafault.profraw"
+          _clang_coverage_setup = "${root_build_dir}/clang_static_coverage_config/${_test_name}ClangCoverageConfig.cpp"
+          pw_python_action("${_test_name}-clang-coverage") {
+            script = "${chip_root}/scripts/build/clang_coverage_wrapper.py"
+            outputs = [ _clang_coverage_setup ]
+            args = [
+              "--output",
+              rebase_path(_clang_coverage_setup),
+              "--raw-profile-filename",
+              "coverage/${_test_name}.profraw",
+            ]
+          }
+
+          source_set("${_test_name}-clang-coverage-src") {
+            sources = [ _clang_coverage_setup ]
+            deps = [ ":${_test_name}-clang-coverage" ]
+          }
+        }
+
         pw_test(_test_name) {
           # Forward certain variables from the invoker.
           forward_variables_from(invoker,
@@ -125,6 +148,10 @@ template("chip_test_suite") {
           # Link to the common lib for this suite so we get its `sources`.
           public_deps += [ ":${_suite_name}.lib" ]
 
+          if (use_coverage && is_clang) {
+            public_deps += [ ":${_test_name}-clang-coverage-src" ]
+          }
+
           if (pw_unit_test_BACKEND == "$dir_pw_unit_test:googletest") {
             test_main = "$dir_pigweed/third_party/googletest:gmock_main"
           }

build/config/compiler/BUILD.gn

@@ -549,6 +549,15 @@ config("coverage") {
     cflags = [ "--coverage" ]
   }
   ldflags = cflags
+
+  if (is_clang) {
+    # Looking to add buildid which _could_ be used for coverage
+    # file format using `%b` (see
+    # https://clang.llvm.org/docs/SourceBasedCodeCoverage.html#running-the-instrumented-program)
+    # however at the time of writing this, linux clang used during bootstrap
+    # does not seem to support this.
+    ldflags += [ "-Wl,--build-id" ]
+  }
 }
 
 config("coverage_default") {

docs/conf.py

@@ -72,6 +72,7 @@
     (MATTER_BASE, "examples/**/*.JPG"),
     (MATTER_BASE, "src/tools/**/*.md"),
     (MATTER_BASE, "scripts/tools/**/*.md"),
+    (MATTER_BASE, "scripts/tools/**/*.png"),
 ]
 external_content_link_prefixes = [
     "src/",