Merge branch 'master' into master

project-chip · Jun 6, 2023 · db30a5a · db30a5a
2 parents 290c672 + 4f6923f
commit db30a5a
Show file tree

Hide file tree

Showing 89 changed files with 434 additions and 13,770 deletions.
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -181,17 +181,6 @@ jobs:
                     linux debug bridge-app \
                     out/linux-x64-bridge/chip-bridge-app \
                     /tmp/bloat_reports/
-            - name: Build example Dynamic Bridge
-              timeout-minutes: 10
-              run: |
-                  ./scripts/run_in_build_env.sh \
-                     "./scripts/build/build_examples.py \
-                        --target linux-x64-dynamic-bridge-ipv6only \
-                        build"
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    linux debug dynamic-bridge-app-ipv6only \
-                    out/linux-x64-dynamic-bridge-ipv6only/dynamic-chip-bridge-app \
-                    /tmp/bloat_reports/
             - name: Build example OTA Provider
               timeout-minutes: 10
               run: |

diff --git a/build/chip/java/config.gni b/build/chip/java/config.gni
@@ -16,7 +16,7 @@ java_path = getenv("JAVA_PATH")
 declare_args() {
   java_matter_controller_dependent_paths = []
   matter_enable_java_compilation = false
-  if (java_path != "" && current_os != "android") {
+  if (java_path != "" && current_os == "linux") {
     java_matter_controller_dependent_paths += [ "${java_path}/include/" ]
 
     if (current_os == "mac") {

diff --git a/docs/examples/index.md b/docs/examples/index.md
@@ -69,15 +69,6 @@ chip-tool/README
 darwin-framework-tool/README
 ```
 
-## Dynamic bridge example
-
-```{toctree}
-:glob:
-:maxdepth: 1
-
-dynamic-bridge-app/**/README
-```
-
 ## Java matter controller example
 
 ```{toctree}

diff --git a/examples/dynamic-bridge-app/bridge-common/BUILD.gn b/examples/dynamic-bridge-app/bridge-common/BUILD.gn