Merge branch 'master' into bridged-basic

And ZAP regen.

.github/.wordlist.txt

@@ -53,7 +53,9 @@ ApplicationBasic
 ApplicationId
 ApplicationIdentifier
 ApplicationLauncher
+applyUpdateAction
 ApplyUpdateRequest
+ApplyUpdateResponse
 approver
 appspot
 aps
@@ -64,6 +66,7 @@ argv
 armeabi
 ARMmbed
 armv
+ASAN
 asdk
 AssertionError
 ASYNC
@@ -143,6 +146,7 @@ capacitive
 CatalogVendorId
 CBB
 cbd
+ccf
 CCMP
 CCS
 CCSTUDIO
@@ -278,6 +282,8 @@ debianutils
 DEDEDEDE
 deepnote
 DelayedActionTime
+delayedActionTimeSec
+delayQuery
 demangle
 deployable
 depottools
@@ -287,6 +293,7 @@ descheduled
 dev
 devcontainer
 devCtrl
+DeviceAttestationCredsExample
 DeviceCaCerts
 DeviceCert
 DeviceCommissioner
@@ -302,6 +309,7 @@ DevKitC
 DevKitM
 df
 dfu
+DgDxsfHx
 dhclient
 DHCP
 DHCPC
@@ -413,6 +421,7 @@ ffeebaefa
 FFF
 fffe
 fffff
+fHtcwcAAAAAAAAAwQAAAAAAXPMlAAAAAAA
 Fi
 filepath
 fini
@@ -429,6 +438,7 @@ fstab
 fsync
 ftd
 fullclean
+fuzzer
 gbl
 gcloud
 GDB
@@ -446,6 +456,9 @@ GetDeviceInfo
 GetDns
 GetIP
 getstarted
+GH
+gh
+ghp
 githubusercontent
 gitignore
 glibc
@@ -504,6 +517,7 @@ ImplClass
 implementers
 imx
 imxlinux
+incomingCommands
 indexhtml
 Inet
 InetLayer
@@ -550,6 +564,7 @@ jupyterlab
 KA
 Kconfig
 KeypadInput
+kInvalidCommandId
 KitProg
 kNodeIdNotSpecified
 knownissues
@@ -569,6 +584,7 @@ libdbus
 LIBDIR
 libegl
 libffi
+libfuzzer
 libgirepository
 libglib
 libical
@@ -716,6 +732,7 @@ nrfdks
 nrfutil
 nrfxlib
 NTAG
+nullptr
 NUM
 nwk
 NXP
@@ -763,6 +780,7 @@ otasoftwareupdaterequestor
 otaURL
 OTBR
 otcli
+outgoingCommands
 PAA
 PacketBuffer
 PAI
@@ -815,6 +833,7 @@ protobuf
 protos
 Prover
 providerNodeId
+providerFabricIndex
 PRs
 PSCAN
 PSK
@@ -833,6 +852,7 @@ PyEval
 PyFunction
 pylint
 PyObject
+pypi
 PyRun
 pytest
 QEMU
@@ -844,6 +864,7 @@ QRCodeUrl
 QSPI
 QueryImage
 QueryImageResponse
+queryImageStatus
 qvCHIP
 RADVD
 raspberryPi
@@ -875,6 +896,7 @@ req
 Requestor
 Requestor's
 Requestors
+RequestorCanConsent
 responder
 retargeting
 reusability
@@ -941,6 +963,7 @@ SiLabs
 SiliconLabs
 SimpleFileExFlags
 SimpleLink
+sizedb
 sl
 SLAAC
 SLTB
@@ -955,6 +978,7 @@ SoftDevice
 softmmu
 SoftwareDiagnostics
 SoftwareVersion
+softwareVersionStr
 SoftwareVersionString
 softwareVersionValid
 SPI
@@ -1023,6 +1047,7 @@ testws
 texinfo
 textboxes
 TFT
+ThIsIsNoTMyReAlGiThUbToKeNSoDoNoTtRy
 threadOperationalDataset
 ThreadStackManager
 ThreadStackManagerImpl
@@ -1034,6 +1059,7 @@ TLV
 tmp
 tngvndl
 TODO
+toJson
 tokenized
 toolchain
 toolchains
@@ -1074,12 +1100,16 @@ UniFlash
 unpair
 unprovisioned
 untrusted
+updateAvailable
+updateNotAvailable
 UpdateTokens
 upstreamed
 URI
 usbmodem
 USBtoUART
 uscif
+UserConsentNeeded
+userConsentState
 userguide
 USERINTERFACE
 UserLabel
@@ -1130,7 +1160,9 @@ WSTK
 xa
 xab
 xaver
+xb
 xbef
+xc
 xcd
 Xcode
 xcodeproj
@@ -1139,8 +1171,11 @@ xd
 xdeadbeefcafe
 xds
 xdsdfu
+xed
 xef
 xF
+xFF
+xFFF
 xFFFF
 xfffff
 xffffffffe
@@ -1151,6 +1186,7 @@ XXXX
 XXXXXXXX
 xyz
 xz
+xzvf
 yaml
 yearday
 yml

.github/workflows/android.yaml

@@ -54,15 +54,23 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
-            - name: Build Android CHIPTool and CHIPTest
+            - name: Build Android CHIPTool and CHIPTest (ARM)
               run: |
                 ./scripts/run_in_build_env.sh \
-                  "./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-{arm,arm64}-chip-*' build"
-            # - name: Build Android Studio build (arm64 only)
-            #   run: |
-            #     ./scripts/run_in_build_env.sh \
-            #       "./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-androidstudio-arm64-chip-tool' build"
+                  "./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-arm-chip-*' build"
+            - name: Clean out build output
+              run: rm -rf ./out
+            - name: Build Android CHIPTool and CHIPTest (ARM64)
+              run: |
+                ./scripts/run_in_build_env.sh \
+                  "./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-arm64-chip-*' build"
             - name: Run Android build rule tests
               run: |
                 ./scripts/run_in_build_env.sh \
                   "ninja -C out/android-arm64-chip-tool build/chip/java/tests:java_build_test.tests"
+            - name: Clean out build output
+              run: rm -rf ./out
+            # - name: Build Android Studio build (arm64 only)
+            #   run: |
+            #     ./scripts/run_in_build_env.sh \
+            #       "./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-androidstudio-arm64-chip-tool' build"

.github/workflows/build.yaml

@@ -70,7 +70,7 @@ jobs:
               timeout-minutes: 20
               run: scripts/run_in_build_env.sh "ninja -C ./out"
             - name: Run Tests
-              timeout-minutes: 2
+              timeout-minutes: 5
               run: scripts/tests/gn_tests.sh
             # TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
             # TODO https://github.com/project-chip/connectedhomeip/issues/1512
@@ -168,11 +168,11 @@ jobs:
                   LSAN_OPTIONS: detect_leaks=0
               run: |
                 # for BUILD_TYPE in asan msan tsan ubsan; do
-                  for BUILD_TYPE in asan ubsan; do
+                  for BUILD_TYPE in asan tsan ubsan; do
                       case $BUILD_TYPE in
                           "asan") GN_ARGS='is_clang=true is_asan=true';;
                           "msan") GN_ARGS='is_clang=true is_msan=true';;
-                          "tsan") GN_ARGS='is_clang=true is_tsan=true';;
+                          "tsan") GN_ARGS='is_clang=true is_tsan=true chip_enable_wifi=false';;
                           "ubsan") GN_ARGS='is_clang=true is_ubsan=true';;
                       esac
 

.github/workflows/examples-linux-imx.yaml

@@ -0,0 +1,51 @@
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Build example - i.MX Linux
+
+on:
+    push:
+    pull_request:
+
+concurrency:
+    group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+    cancel-in-progress: true
+
+jobs:
+    imx:
+        name: Linux i.MX Build
+        timeout-minutes: 70
+
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: connectedhomeip/chip-build-imx:0.5.52
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  submodules: true
+
+            - name: Build App
+              timeout-minutes: 30
+              run: |
+                  ./scripts/examples/imxlinux_example.sh \
+                  examples/lighting-app/linux/ examples/lighting-app/linux/out/aarch64
+            - name: Build chip-tool
+              timeout-minutes: 30
+              run: |
+                   ./scripts/examples/imxlinux_example.sh \
+                   examples/chip-tool examples/chip-tool/out/aarch64

.github/workflows/examples-linux-standalone.yaml

@@ -61,6 +61,11 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
+            - name: Build Standalone cert tool
+              timeout-minutes: 5
+              run: |
+                 ./scripts/run_in_build_env.sh \
+                 "./scripts/build/build_examples.py --no-log-timestamps --target-glob '*-chip-cert' build"
             - name: Build example Standalone Echo Client
               timeout-minutes: 5
               run: |

.github/workflows/lint.yml

@@ -43,6 +43,14 @@ jobs:
         run: |
           git grep -n "VerifyOrExit(.*, [A-Za-z]*_ERROR" -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
 
+      # git grep exits with 0 if it finds a match, but we want
+      # to fail (exit nonzero) on match.  And we wasnt to exclude this file,
+      # to avoid our grep regexp matching itself.
+      - name: Check for use of PRI*8, which are not supported on some libcs.
+        if: always()
+        run: |
+          git grep -n "PRI.8" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
+
       # Comments like '{{! ... }}' should be used in zap files
       - name: Do not allow TODO in generated files
         if: always()

.github/workflows/tests.yaml

@@ -89,7 +89,6 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
-                     --target-skip-glob '{TestGroupDemoCommand,TestGroupDemoConfig}' \
                      --chip-tool ./out/linux-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT}/chip-tool \
                      run \
                      --iterations 1 \
@@ -181,7 +180,7 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
                      --chip-tool ./out/darwin-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT}/chip-tool \
-                     --target-skip-glob '{TestGroupMessaging,TestGroupDemoCommand,TestGroupDemoConfig,TV_*}' \
+                     --target-skip-glob '{TestGroupMessaging,TV_*}' \
                      run \
                      --iterations 1 \
                      --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \

.gitmodules

@@ -184,3 +184,9 @@
 [submodule "third_party/mbed-mcu-boot/repo"]
 	path = third_party/mbed-mcu-boot/repo
 	url = https://github.com/ATmobica/mcuboot.git
+[submodule "perfetto"]
+	path = third_party/perfetto/repo
+	url = https://github.com/google/perfetto
+[submodule "p6/serial-flash"]
+	path = third_party/p6/p6_sdk/libs/serial-flash
+	url = https://github.com/Infineon/serial-flash

.pullapprove.yml

@@ -164,7 +164,7 @@ groups:
             requests.
         type: required
         requirements:
-            - len(groups.approved.include('shared-reviewers-*')) >= 3
+            - len(groups.approved.include('shared-reviewers-*')) >= 2
         reviews:
             required: 0
         labels: