Update rotating-id-generation from master

.devcontainer/devcontainer.json

@@ -40,7 +40,6 @@
     "settings": {
         "terminal.integrated.shell.linux": "/bin/bash"
     },
-    "postCreateCommand": "source /usr/share/bash-completion/bash_completion && source /etc/bash_completion.d/git-prompt && sudo chgrp docker /var/run/docker.sock",
     "remoteEnv": {
         "GIT_PS1_SHOWDIRTYSTATE": "1",
         "GIT_PS1_SHOWSTASHSTATE": "1",

.github/workflows/release_artifacts.yaml

@@ -0,0 +1,81 @@
+# Copyright (c) 2020 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 release artifacts
+
+on:
+    workflow_dispatch:
+        inputs:
+            releaseTag:
+                description: Release Tag
+                required: true
+
+jobs:
+    esp32:
+        name: ESP32
+        env:
+            BUILD_DIRECTORY: examples/all-clusters-app/esp32/build
+        runs-on: ubuntu-latest
+
+        container:
+            image: connectedhomeip/chip-build-esp32:0.4.18
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  submodules: true
+                  ref: "${{ github.event.inputs.releaseTag }}"
+            - name: Build
+              run: scripts/examples/esp_echo_app.sh
+
+            - name: Upload artifact
+              run: |
+                 scripts/helpers/upload_release_asset.py                  \
+                    --github-repository project-chip/connectedhomeip      \
+                    --github-api-token "${{ secrets.GITHUB_TOKEN }}"      \
+                    --release-tag "${{ github.event.inputs.releaseTag }}" \
+                    --bundle-files $BUILD_DIRECTORY/chip-all-clusters-app.flashbundle.txt \
+                    --working-directory $BUILD_DIRECTORY                  \
+                    --bundle-name esp32-chip-all-clusters-app
+
+    efr32:
+        name: EFR32
+        env:
+            EFR32_BOARD: BRD4161A
+            BUILD_DIRECTORY: out/lock_app_debug/BRD4161A
+
+        runs-on: ubuntu-latest
+
+        container:
+            image: connectedhomeip/chip-build-efr32:0.4.18
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  submodules: true
+                  ref: "${{ github.event.inputs.releaseTag }}"
+            - name: Build example EFR32 Lock App 
+              run:
+                  scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/ out/lock_app_debug $EFR32_BOARD
+
+            - name: Upload artifact
+              run: |
+                 scripts/helpers/upload_release_asset.py                     \
+                    --github-repository project-chip/connectedhomeip         \
+                    --github-api-token "${{ secrets.GITHUB_TOKEN }}"         \
+                    --release-tag "${{ github.event.inputs.releaseTag }}"    \
+                    --bundle-files $BUILD_DIRECTORY/lock_app.flashbundle.txt \
+                    --working-directory $BUILD_DIRECTORY                     \
+                    --bundle-name efr32-$EFR32_BOARD-chip-lock-example

.gn

@@ -12,14 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build_overrides/build.gni")
+import("//build_overrides/pigweed.gni")
+
 # The location of the build configuration file.
-buildconfig = "//build/config/BUILDCONFIG.gn"
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
 
 # CHIP uses angle bracket includes.
 check_system_includes = true
 
-import("//build_overrides/pigweed.gni")
-
 script_executable = "python3"
 
 default_args = {

.pullapprove.yml

@@ -8,13 +8,6 @@ github_api_version: "shadow-cat-preview"
 ############################################################
 
 pullapprove_conditions:
-    ############################################################
-    #  Required status checks
-    ############################################################
-    - condition: "'*restyle*' in statuses.successful"
-      unmet_status: "failure"
-      explanation: "Style must be inline before reviewing can be complete"
-
     ############################################################
     #  License Checks
     ############################################################
@@ -45,6 +38,13 @@ pullapprove_conditions:
     ############################################################
     - "'hotfix' not in labels"
 
+    ############################################################
+    #  Required status checks
+    ############################################################
+    - condition: "'*restyle*' in statuses.successful"
+      unmet_status: "failure"
+      explanation: "Style must be inline before reviewing can be complete"
+
 ############################################################
 #  Notifications
 ############################################################

.vscode/tasks.json

@@ -114,6 +114,19 @@
                 ]
             }
         },
+        {
+            "label": "Build QPG6100 Lock Example",
+            "type": "shell",
+            "command": "scripts/examples/gn_build_example.sh examples/lock-app/qpg6100 out/qpg6100_lock_app",
+            "group": "build",
+            "problemMatcher": {
+                "base": "$gcc",
+                "fileLocation": [
+                    "relative",
+                    "${workspaceFolder}/out/qpg6100_lock_app/"
+                ]
+            }
+        },
         {
             "label": "Build EFR32 Lock Example",
             "type": "shell",
@@ -127,6 +140,19 @@
                 ]
             }
         },
+        {
+            "label": "Build EFR32 Light Example",
+            "type": "shell",
+            "command": "scripts/examples/gn_build_example.sh examples/lighting-app/efr32 out/efr32_lighting_app",
+            "group": "build",
+            "problemMatcher": {
+                "base": "$gcc",
+                "fileLocation": [
+                    "relative",
+                    "${workspaceFolder}/out/efr32_lighting/"
+                ]
+            }
+        },
         {
             "label": "Build Minimal MDNS Example",
             "type": "shell",

BUILD.gn

@@ -12,20 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/mbedtls.gni")
 import("//build_overrides/nlassert.gni")
 import("//build_overrides/nlio.gni")
 import("//build_overrides/nlunit_test.gni")
 import("//build_overrides/pigweed.gni")
+
 import("//src/platform/device.gni")
 import("$dir_pw_build/python.gni")
 
 # This build file should not be used in superproject builds.
 assert(chip_root == "//")
 
-import("${chip_root}/build/chip/tests.gni")
-import("${chip_root}/build/chip/tools.gni")
+import("${build_root}/chip/tests.gni")
+import("${build_root}/chip/tools.gni")
 
 if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
   declare_args() {
@@ -115,7 +117,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
   }
 } else {
   # This is the unified build. Configure various real toolchains.
-  import("${chip_root}/build/chip/chip_build.gni")
+  import("${build_root}/chip/chip_build.gni")
   declare_args() {
     # Set this to false to disable all builds by default.
     enable_default_builds = true
@@ -138,19 +140,20 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
 
   declare_args() {
     # Enable building chip with clang.
-    enable_host_clang_build = enable_default_builds
+    enable_host_clang_build = enable_default_builds && host_os != "win"
 
     # Enable building chip with gcc.
-    enable_host_gcc_build = enable_default_builds
+    enable_host_gcc_build = enable_default_builds && host_os != "win"
 
     # Enable building chip with gcc & mbedtls.
-    enable_host_gcc_mbedtls_build = enable_default_builds
+    enable_host_gcc_mbedtls_build = enable_default_builds && host_os != "win"
 
     # Build the chip-tool example.
-    enable_standalone_chip_tool_build = enable_default_builds
+    enable_standalone_chip_tool_build =
+        enable_default_builds && host_os != "win"
 
     # Build the shell example.
-    enable_standalone_shell_build = enable_default_builds
+    enable_standalone_shell_build = enable_default_builds && host_os != "win"
 
     # Build the Linux all clusters app example.
     enable_linux_all_clusters_app_build =
@@ -178,13 +181,13 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
 
   if (enable_host_clang_build) {
     chip_build("host_clang") {
-      toolchain = "//build/toolchain/host:${host_os}_${host_cpu}_clang"
+      toolchain = "${build_root}/toolchain/host:${host_os}_${host_cpu}_clang"
     }
   }
 
   if (enable_host_gcc_build) {
     chip_build("host_gcc") {
-      toolchain = "//build/toolchain/host:${host_os}_${host_cpu}_gcc"
+      toolchain = "${build_root}/toolchain/host:${host_os}_${host_cpu}_gcc"
     }
   }
 
@@ -196,19 +199,19 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
 
   if (enable_android_builds) {
     chip_build("android_arm") {
-      toolchain = "//build/toolchain/android:android_arm"
+      toolchain = "${build_root}/toolchain/android:android_arm"
     }
 
     chip_build("android_arm64") {
-      toolchain = "//build/toolchain/android:android_arm64"
+      toolchain = "${build_root}/toolchain/android:android_arm64"
     }
 
     chip_build("android_x64") {
-      toolchain = "//build/toolchain/android:android_x64"
+      toolchain = "${build_root}/toolchain/android:android_x64"
     }
 
     chip_build("android_x86") {
-      toolchain = "//build/toolchain/android:android_x86"
+      toolchain = "${build_root}/toolchain/android:android_x86"
     }
   }
 
@@ -308,9 +311,18 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     if (enable_efr32_lock_app_build) {
       deps += [ ":efr32_lock_app" ]
     }
+    if (enable_efr32_lighting_app_build) {
+      deps += [ ":efr32_lighting_app" ]
+    }
     if (enable_k32w_lock_app_build) {
       deps += [ ":k32w_lock_app" ]
     }
+    if (enable_qpg6100_lock_app_build) {
+      deps += [ ":qpg6100_lock_app" ]
+    }
+    if (enable_cc13x2_26x2_lock_app_build) {
+      deps += [ ":cc13x2_26x2_lock_app" ]
+    }
   }
 
   group("check") {

build/chip/buildconfig_header.gni

@@ -101,14 +101,15 @@
 #     ]
 #   }
 
+import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
 template("buildconfig_header") {
   source_set_name = target_name
   gen_target_name = "gen_${target_name}"
 
   action(gen_target_name) {
-    script = "${chip_root}/build/chip/write_buildconfig_header.py"
+    script = "${build_root}/chip/write_buildconfig_header.py"
 
     if (defined(invoker.header_dir)) {
       header_file = "${invoker.header_dir}/${invoker.header}"

build/chip/chip_build.gni

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build_overrides/chip.gni")
+import("//build_overrides/build.gni")
 
-import("${chip_root}/build/chip/tests.gni")
+import("${build_root}/chip/tests.gni")
 
 template("chip_build") {
   _build_name = target_name

build/chip/chip_test.gni

@@ -12,11 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
+
 import("$dir_pw_build/python_action.gni")
 
-import("${chip_root}/build/chip/tests.gni")
+import("${build_root}/chip/tests.gni")
 import("${chip_root}/src/platform/device.gni")
 import("${dir_pw_unit_test}/test.gni")
 

build/chip/chip_test_group.gni

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build_overrides/chip.gni")
+import("//build_overrides/build.gni")
 
-import("${chip_root}/build/chip/tests.gni")
+import("${build_root}/chip/tests.gni")
 
 assert(chip_build_tests)
 

build/chip/chip_test_suite.gni

@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/build/chip/chip_test.gni")
-import("${chip_root}/build/chip/tests.gni")
+import("${build_root}/chip/chip_test.gni")
+import("${build_root}/chip/tests.gni")
 import("${dir_pw_unit_test}/test.gni")
 
 assert(chip_build_tests)

build/chip/happy_test.gni

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/build/chip/tests.gni")
+import("${build_root}/chip/tests.gni")
 
 assert(chip_build_tests)
 assert(chip_enable_happy_tests)

build/chip/java/BUILD.gn

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build_overrides/chip.gni")
+import("//build_overrides/build.gni")
 
-import("//build/config/android/config.gni")
-import("//build/config/android_abi.gni")
+import("${build_root}/config/android/config.gni")
+import("${build_root}/config/android_abi.gni")
 
 # Place a copy of the shared c++ support library in the jni output directory
 # See: