From 0a995b0a1fd1f76efea9308a16792ae4f318781f Mon Sep 17 00:00:00 2001
From: Daniel Kneip <80306648+latch-danielkneip@users.noreply.github.com>
Date: Wed, 22 Jun 2022 19:12:24 -0700
Subject: [PATCH] Linux Matter bridge app that supports Wi-Fi without Thread
 (#19725)

* [Latch] For Matter SDK bridge, support Wi-Fi without needing Thread (#18782)

* Restyled by gn

* [Latch] For Matter SDK bridge, support Wi-Fi without needing Thread (#18782)

* Restyled by clang-format

Co-authored-by: Restyled.io <commits@restyled.io>
---
 src/platform/Linux/BUILD.gn                    | 7 ++++++-
 src/platform/Linux/ConnectivityManagerImpl.cpp | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/platform/Linux/BUILD.gn b/src/platform/Linux/BUILD.gn
index 29c232f2a97159..24a69a0a8781cb 100644
--- a/src/platform/Linux/BUILD.gn
+++ b/src/platform/Linux/BUILD.gn
@@ -65,7 +65,6 @@ static_library("Linux") {
     "Logging.cpp",
     "NetworkCommissioningDriver.h",
     "NetworkCommissioningEthernetDriver.cpp",
-    "NetworkCommissioningThreadDriver.cpp",
     "NetworkCommissioningWiFiDriver.cpp",
     "PlatformManagerImpl.cpp",
     "PlatformManagerImpl.h",
@@ -84,6 +83,10 @@ static_library("Linux") {
     "bluez/Types.h",
   ]
 
+  if (chip_enable_openthread) {
+    sources += [ "NetworkCommissioningThreadDriver.cpp" ]
+  }
+
   deps = [ "${chip_root}/src/setup_payload" ]
 
   public_deps = [
@@ -123,6 +126,8 @@ static_library("Linux") {
   }
 
   if (chip_enable_wifi) {
+    sources += [ "GlibTypeDeleter.h" ]
+
     public_deps += [ "dbus/wpa" ]
   }
 
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
index f30e0648435c57..30d713a5f7bb14 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.cpp
+++ b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -57,6 +57,7 @@
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
+#include <platform/Linux/GlibTypeDeleter.h>
 #include <platform/internal/GenericConnectivityManagerImpl_WiFi.ipp>
 #endif