Merge branch 'master' into telink_matter_pm_update

.gitmodules

@@ -247,7 +247,7 @@
 [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
 	path = third_party/silabs/wiseconnect-wifi-bt-sdk
 	url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git
-	branch = master
+	branch = 2.7.1-Matter
 	platforms = efr32,silabs_docker
 [submodule "editline"]
 	path = third_party/editline/repo

.restyled.yaml

@@ -78,6 +78,7 @@ exclude:
     - "scripts/run_codegen_targets.sh" # shellharden breaks for loops over command outputs
     - "src/darwin/Framework/CHIP/zap-generated/*" # already clang-formatted by our zap tooling
     - "zzz_generated/**/*" # already clang-formatted by our zap tooling
+    - "src/controller/java/generated/java/**/*" # not formatted: generated files
 
 
 changed_paths:

build/chip/chip_codegen.gni

@@ -263,7 +263,7 @@ template("_chip_build_time_zapgen") {
 #     The ".matter" file to use to start the code generation
 #
 #   generator
-#     Name of the generator to use (e.g. java, cpp-app)
+#     Name of the generator to use (e.g. java-jni, java-class, cpp-app)
 #
 #   outputs
 #     Explicit names of the expected outputs. Enforced to validate that
@@ -296,7 +296,7 @@ template("_chip_build_time_zapgen") {
 #
 #  chip_codegen("java-jni-generate") {
 #    input = "controller-clusters.matter"
-#    generator = "java"
+#    generator = "java-jni"
 #
 #    outputs = [
 #       "jni/IdentifyClient-ReadImpl.cpp",
@@ -358,7 +358,7 @@ template("chip_codegen") {
 #     The ".matter" file to use to start the code generation
 #
 #   generator
-#     Name of the generator to use (e.g. java, cpp-app)
+#     Name of the generator to use (e.g. java-jni, java-class, cpp-app)
 #
 #   outputs
 #     Explicit names of the expected outputs. Enforced to validate that
@@ -391,7 +391,7 @@ template("chip_codegen") {
 #
 #  chip_codegen("java-jni-generate") {
 #    input = "controller-clusters.matter"
-#    generator = "java"
+#    generator = "java-jni"
 #
 #    outputs = [
 #       "jni/IdentifyClient-ReadImpl.cpp",