per Damian-Nordic, introduce chip_enable_network_commissioning

This allows general and ethernet network commissioning source to be
conditionally included in platform configuration.

examples/all-clusters-app/linux/BUILD.gn

@@ -24,8 +24,6 @@ source_set("chip-all-clusters-common") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
-    "${chip_root}/src/platform/Linux/NetworkCommissioningDriver.h",
-    "${chip_root}/src/platform/Linux/NetworkCommissioningEthernetDriver.cpp",
     "AppOptions.cpp",
     "include/tv-callbacks.cpp",
     "include/tv-callbacks.h",

examples/all-clusters-app/linux/main-common.cpp

@@ -405,15 +405,20 @@ NetworkCommissioning::LinuxThreadDriver sThreadDriver;
 NetworkCommissioning::LinuxWiFiDriver sWiFiDriver;
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
+#if CHIP_DEVICE_ENABLE_NETWORK_COMMISSIONING
 NetworkCommissioning::LinuxEthernetDriver sEthernetDriver;
+#endif // CHIP_DEVICE_ENABLE_NETWORK_COMMISSIONING
+
 #endif // CHIP_DEVICE_LAYER_TARGET_LINUX
 
 #if CHIP_DEVICE_LAYER_TARGET_DARWIN
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 NetworkCommissioning::DarwinWiFiDriver sWiFiDriver;
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
+#if CHIP_DEVICE_CONFIG_ENABLE_NETWORK_COMMISSIONING
 NetworkCommissioning::DarwinEthernetDriver sEthernetDriver;
+#endif // CHIP_DEVICE_CONFIG_ENABLE_NETWORK_COMMISSIONING
 #endif // CHIP_DEVICE_LAYER_TARGET_DARWIN
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
@@ -424,7 +429,9 @@ Clusters::NetworkCommissioning::Instance sThreadNetworkCommissioningInstance(kNe
 Clusters::NetworkCommissioning::Instance sWiFiNetworkCommissioningInstance(kNetworkCommissioningEndpointSecondary, &sWiFiDriver);
 #endif
 
+#if CHIP_DEVICE_CONFIG_ENABLE_NETWORK_COMMISSIONING
 Clusters::NetworkCommissioning::Instance sEthernetNetworkCommissioningInstance(kNetworkCommissioningEndpointMain, &sEthernetDriver);
+#endif // CHIP_DEVICE_CONFIG_ENABLE_NETWORK_COMMISSIONING
 } // namespace
 
 void ApplicationInit()
@@ -482,7 +489,9 @@ void ApplicationInit()
     }
     else
     {
+#if CHIP_DEVICE_CONFIG_ENABLE_NETWORK_COMMISSIONING
         sEthernetNetworkCommissioningInstance.Init();
+#endif
     }
 }
 

examples/all-clusters-minimal-app/linux/BUILD.gn

@@ -24,8 +24,6 @@ source_set("chip-all-clusters-common") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
-    "${chip_root}/src/platform/Linux/NetworkCommissioningDriver.h",
-    "${chip_root}/src/platform/Linux/NetworkCommissioningEthernetDriver.cpp",
     "AppOptions.cpp",
     "include/tv-callbacks.cpp",
     "include/tv-callbacks.h",

examples/all-clusters-minimal-app/linux/main-common.cpp

@@ -107,9 +107,11 @@ NetworkCommissioning::LinuxWiFiDriver sLinuxWiFiDriver;
 Clusters::NetworkCommissioning::Instance sWiFiNetworkCommissioningInstance(kNetworkCommissioningEndpointSecondary,
                                                                            &sLinuxWiFiDriver);
 #endif
+#if CHIP_DEVICE_ENABLE_NETWORK_COMMISSIONING
 NetworkCommissioning::LinuxEthernetDriver sLinuxEthernetDriver;
 Clusters::NetworkCommissioning::Instance sEthernetNetworkCommissioningInstance(kNetworkCommissioningEndpointMain,
                                                                                &sLinuxEthernetDriver);
+#endif
 #else  // CHIP_DEVICE_LAYER_TARGET_LINUX
 Clusters::NetworkCommissioning::NullNetworkDriver sNullNetworkDriver;
 Clusters::NetworkCommissioning::Instance sNullNetworkCommissioningInstance(kNetworkCommissioningEndpointMain, &sNullNetworkDriver);
@@ -169,11 +171,13 @@ void ApplicationInit()
     else
 #endif // CHIP_DEVICE_LAYER_TARGET_LINUX
     {
+#if CHIP_DEVICE_ENABLE_NETWORK_COMMISSIONING
 #if CHIP_DEVICE_LAYER_TARGET_LINUX
         sEthernetNetworkCommissioningInstance.Init();
 #else
         // Use NullNetworkCommissioningInstance to disable the network commissioning functions.
         sNullNetworkCommissioningInstance.Init();
+#endif
 #endif
     }
 }

examples/ota-requestor-app/linux/BUILD.gn

@@ -23,8 +23,6 @@ executable("chip-ota-requestor-app") {
     "${chip_root}/examples/platform/linux:app-main",
     "${chip_root}/src/app/server",
     "${chip_root}/src/lib",
-    "${chip_root}/src/platform/Linux/NetworkCommissioningDriver.h",
-    "${chip_root}/src/platform/Linux/NetworkCommissioningEthernetDriver.cpp",
   ]
 
   cflags = [ "-Wconversion" ]

src/platform/Ameba/BUILD.gn

@@ -41,15 +41,23 @@ static_library("Ameba") {
     "KeyValueStoreManagerImpl.h",
     "Logging.cpp",
     "LwIPCoreLock.cpp",
-    "NetworkCommissioningDriver.h",
-    "NetworkCommissioningWiFiDriver.cpp",
     "PlatformManagerImpl.cpp",
     "PlatformManagerImpl.h",
     "SoftwareUpdateManagerImpl.h",
     "SystemTimeSupport.cpp",
     "SystemTimeSupport.h",
   ]
 
+  if (chip_enable_network_commissioning) {
+    sources += [
+      "NetworkCommissioningDriver.h",
+    }
+  }
+
+  if (chip_enable_wifi) {
+    sources += [ "NetworkCommissioningWiFiDriver.cpp" ]
+  }
+
   deps = [
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/setup_payload",

src/platform/BUILD.gn

@@ -118,6 +118,17 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       defines += [ "CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=${chip_enable_ble}" ]
     }
 
+  if (chip_device_platform == "ameba" ||
+      chip_device_platform == "darwin" ||
+      chip_device_platform == "esp32" ||
+      chip_device_platform == "linux" ||
+      chip_device_platform == "mbed" ||
+      chip_device_platform == "qpg" ||
+      chip_device_platform == "tizen" ||
+      chip_device_platform == "webos") {
+    defines += [ "CHIP_DEVICE_CONFIG_ENABLE_NETWORK_COMMISSIONING=${chip_enable_network_commissioning}" ]
+  }
+
     if (chip_enable_nfc) {
       defines += [
         "CHIP_DEVICE_CONFIG_ENABLE_NFC=1",

src/platform/Darwin/BUILD.gn

@@ -61,7 +61,6 @@ static_library("Darwin") {
     "Logging.cpp",
     "MdnsError.cpp",
     "MdnsError.h",
-    "NetworkCommissioningDriver.h",
     "PlatformManagerImpl.cpp",
     "PlatformManagerImpl.h",
     "PosixConfig.cpp",
@@ -70,6 +69,10 @@ static_library("Darwin") {
     "SystemTimeSupport.cpp",
   ]
 
+  if (chip_enable_network_commissioning) {
+    sources += [ "NetworkCommissioningDriver.h" ]
+  }
+
   if (chip_enable_wifi) {
     sources += [
       "WiFi/ConfigurationManagerImplWiFi.cpp",

src/platform/ESP32/BUILD.gn

@@ -74,12 +74,15 @@ static_library("ESP32") {
     ]
   }
 
-  if (chip_enable_wifi) {
+  if (chip_enable_network_commissioning) {
     sources += [
-      "ConnectivityManagerImpl_WiFi.cpp",
       "NetworkCommissioningDriver.cpp",
       "NetworkCommissioningDriver.h",
     ]
+  }
+
+  if (chip_enable_wifi) {
+    sources += [ "ConnectivityManagerImpl_WiFi.cpp" ]
     if (chip_mdns == "platform") {
       sources += [
         "DnssdImpl.cpp",

src/platform/Linux/BUILD.gn

@@ -80,6 +80,13 @@ static_library("Linux") {
     sources += [ "NetworkCommissioningThreadDriver.cpp" ]
   }
 
+  if (chip_enable_network_commissioning) {
+    sources += [
+      "NetworkCommissioningDriver.h",
+      "NetworkCommissioningEthernetDriver.cpp",
+    ]
+  }
+
   if (chip_enable_ble) {
     sources += [
       "bluez/AdapterIterator.cpp",

src/platform/P6/BUILD.gn

@@ -47,8 +47,6 @@ static_library("P6") {
     "LwIPCoreLock.cpp",
     "MTBKeyValueStore.cpp",
     "MTBKeyValueStore.h",
-    "NetworkCommissioningDriver.h",
-    "NetworkCommissioningWiFiDriver.cpp",
     "OTAImageProcessorImpl.cpp",
     "OTAImageProcessorImpl.h",
     "P6Config.cpp",
@@ -69,6 +67,14 @@ static_library("P6") {
     "cycfg_gatt_db.h",
   ]
 
+  if (chip_enable_network_commissioning) {
+    sources += [ "NetworkCommissioningDriver.h" ]
+  }
+
+  if (chip_enable_wifi) {
+    sources += [ "NetworkCommissioningWiFiDriver.cpp" ]
+  }
+
   deps = [
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/setup_payload",

src/platform/Tizen/BUILD.gn

@@ -53,9 +53,6 @@ static_library("Tizen") {
     "Logging.cpp",
     "MainLoop.cpp",
     "MainLoop.h",
-    "NetworkCommissioningDriver.h",
-    "NetworkCommissioningThreadDriver.cpp",
-    "NetworkCommissioningWiFiDriver.cpp",
     "PlatformManagerImpl.cpp",
     "PlatformManagerImpl.h",
     "PosixConfig.cpp",
@@ -81,6 +78,14 @@ static_library("Tizen") {
     deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
   }
 
+  if (chip_network_commissioning) {
+    sources += [
+    "NetworkCommissioningDriver.h",
+    "NetworkCommissioningThreadDriver.cpp",
+    "NetworkCommissioningWiFiDriver.cpp",
+    ]
+  }
+
   if (chip_enable_openthread) {
     sources += [
       "ThreadStackManagerImpl.cpp",

src/platform/device.gni

@@ -57,14 +57,24 @@ declare_args() {
 declare_args() {
   chip_openthread_ftd = chip_enable_openthread
 
+  # Enable network commissioning.
+  chip_enable_network_commissioning =
+      chip_device_platform == "ameba" ||
+      chip_device_platform == "darwin" ||
+      chip_device_platform == "esp32" ||
+      chip_device_platform == "linux" ||
+      chip_device_platform == "mbed" ||
+      chip_device_platform == "qpg" ||
+      chip_device_platform == "tizen" ||
+      chip_device_platform == "webos"
+
   # Enable wifi support.
   chip_enable_wifi =
       chip_device_platform == "linux" || chip_device_platform == "esp32" ||
       chip_device_platform == "mbed" || chip_device_platform == "tizen" ||
       chip_device_platform == "android" || chip_device_platform == "ameba" ||
       chip_device_platform == "webos" || chip_device_platform == "cc32xx" ||
-      chip_device_platform == "bl602" || chip_device_platform == "bl602" ||
-      chip_device_platform == "mw320" ||
+      chip_device_platform == "bl602" || chip_device_platform == "mw320" ||
       (chip_device_platform == "darwin" && current_os == "mac")
 
   # Enable ble support.

src/platform/mbed/BUILD.gn

@@ -26,23 +26,28 @@ static_library("mbed") {
     "ConfigurationManagerImpl.cpp",
     "ConnectivityManagerImpl.cpp",
     "ConnectivityManagerImpl.h",
-    "DeviceNetworkProvisioningDelegateImpl.cpp",
-    "DeviceNetworkProvisioningDelegateImpl.h",
     "DiagnosticDataProviderImpl.cpp",
     "DiagnosticDataProviderImpl.h",
     "KeyValueStoreManagerImpl.cpp",
     "KeyValueStoreManagerImpl.h",
     "Logging.cpp",
     "MbedConfig.cpp",
     "MbedEventTimeout.cpp",
-    "NetworkCommissioningDriver.h",
     "PlatformManagerImpl.cpp",
     "SystemTimeSupport.cpp",
     "arch.c",
   ]
 
   public_deps = [ "${chip_root}/src/platform:platform_base" ]
 
+  if (chip_enable_network_commissioning) {
+    sources += [
+      "NetworkCommissioningDriver.h",
+      "DeviceNetworkProvisioningDelegateImpl.cpp",
+      "DeviceNetworkProvisioningDelegateImpl.h",
+    }
+  }
+
   if (chip_enable_wifi) {
     sources += [
       "ConnectivityManagerImpl_WiFi.cpp",

src/platform/qpg/BUILD.gn

@@ -36,8 +36,6 @@ static_library("qpg") {
     "ConfigurationManagerImpl.h",
     "ConnectivityManagerImpl.cpp",
     "ConnectivityManagerImpl.h",
-    "DeviceNetworkProvisioningDelegateImpl.cpp",
-    "DeviceNetworkProvisioningDelegateImpl.h",
     "DiagnosticDataProviderImpl.cpp",
     "DiagnosticDataProviderImpl.h",
     "InetPlatformConfig.h",
@@ -61,6 +59,13 @@ static_library("qpg") {
     "KeyValueStoreManagerImpl.h",
   ]
 
+  if (chip_enable_network_commissioning) {
+    sources += [
+      "DeviceNetworkProvisioningDelegateImpl.cpp",
+      "DeviceNetworkProvisioningDelegateImpl.h",
+    ]
+  }
+
   if (chip_enable_openthread) {
     if (chip_openthread_ftd) {
       public_deps += [ "${openthread_root}:libopenthread-ftd" ]

src/platform/webos/BUILD.gn

@@ -92,9 +92,6 @@ static_library("webos") {
     "Logging.cpp",
     "MainLoop.cpp",
     "MainLoop.h",
-    "NetworkCommissioningDriver.h",
-    "NetworkCommissioningThreadDriver.cpp",
-    "NetworkCommissioningWiFiDriver.cpp",
     "PlatformManagerImpl.cpp",
     "PlatformManagerImpl.h",
     "PosixConfig.cpp",
@@ -128,17 +125,25 @@ static_library("webos") {
     ]
   }
 
+  if (chip_enable_network_commissioning) {
+    sources += [
+      "NetworkCommissioningDriver.h",
+    ]
+  }
+
   if (chip_enable_openthread) {
     sources += [
       "GlibTypeDeleter.h",
       "ThreadStackManagerImpl.cpp",
       "ThreadStackManagerImpl.h",
+      "NetworkCommissioningThreadDriver.cpp",
     ]
 
     public_deps += [ "dbus/openthread" ]
   }
 
   if (chip_enable_wifi) {
+    "NetworkCommissioningWiFiDriver.cpp",
     # TBD: Use webOS specific Wi-Fi resource
     #public_deps += [ "dbus/wpa" ]
   }