Merge branch 'master' into post_merge_cleanup_36229_ember_buffer_encode

project-chip · Oct 28, 2024 · 3d364fa · 3d364fa
2 parents d0e58ef + 928efd7
commit 3d364fa
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -332,6 +332,7 @@
 [submodule "third_party/lwip/repo"]
 	path = third_party/lwip/repo
 	url = https://github.com/lwip-tcpip/lwip.git
+	excluded-platforms = darwin
 [submodule "third_party/abseil-cpp/src"]
 	path = third_party/abseil-cpp/src
 	url = https://github.com/abseil/abseil-cpp.git

diff --git a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
@@ -185,6 +185,10 @@
                                                                                          intermediateCertificate:nil
                                                                                                  rootCertificate:certificateIssuer.rootCertificate];
         [params setOperationalCertificateIssuer:certificateIssuer queue:controllerStorageQueue];
+
+        __auto_type * otaDelegateQueue = dispatch_queue_create("com.chip.ota", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
+        [params setOTAProviderDelegate:mOTADelegate queue:otaDelegateQueue];
+
         params.productAttestationAuthorityCertificates = productAttestationAuthorityCertificates;
 
         __auto_type * controller = [[MTRDeviceController alloc] initWithParameters:params error:&error];

diff --git a/scripts/checkout_submodules.py b/scripts/checkout_submodules.py
@@ -66,6 +66,18 @@ def load_module_info() -> None:
             platforms = set(filter(None, platforms))
             assert not (
                 platforms - ALL_PLATFORMS), "Submodule's platform not contained in ALL_PLATFORMS"
+
+            # Check for explicitly excluded platforms
+            excluded_platforms = module.get('excluded-platforms', '').split(',')
+            excluded_platforms = set(filter(None, excluded_platforms))
+            assert not (
+                excluded_platforms - ALL_PLATFORMS), "Submodule excluded on platforms not contained in ALL_PLATFORMS"
+
+            if len(excluded_platforms) != 0:
+                if len(platforms) == 0:
+                    platforms = ALL_PLATFORMS
+                platforms = platforms - excluded_platforms
+
             recursive = module.getboolean('recursive', False)
             name = name.replace('submodule "', '').replace('"', '')
             yield Module(name=name, path=module['path'], platforms=platforms, recursive=recursive)

diff --git a/src/lwip/lwip.gni b/src/lwip/lwip.gni
@@ -14,7 +14,8 @@
 
 declare_args() {
   # Have the lwIP library available.
-  chip_with_lwip = current_os != "zephyr" && current_os != "mbed"
+  chip_with_lwip = current_os != "zephyr" && current_os != "mbed" &&
+                   current_os != "mac" && current_os != "ios"
 
   # lwIP platform: standalone, freertos.
   lwip_platform = ""