Followup #1 for project-chip#5244. Always add 'chip.ble' modules even…

… if ble is natively disabled (project-chip#5312)
mspang · Mar 11, 2021 · 01c7acb · 01c7acb
1 parent f800b9d
commit 01c7acb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 22 deletions.
diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp
@@ -168,7 +168,7 @@ int main(int argc, char * argv[])
 
     chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName(nullptr); // Use default device name (CHIP-XXXX)
 
-#ifdef CONFIG_NETWORK_BLE
+#if CONFIG_NETWORK_LAYER_BLE
     chip::DeviceLayer::Internal::BLEMgrImpl().ConfigureBle(LinuxDeviceOptions::GetInstance().mBleDevice, false);
 #endif
 

diff --git a/examples/lighting-app/linux/main.cpp b/examples/lighting-app/linux/main.cpp
@@ -168,7 +168,7 @@ int main(int argc, char * argv[])
 
     chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName(nullptr); // Use default device name (CHIP-XXXX)
 
-#ifdef CONFIG_NETWORK_BLE
+#if CONFIG_NETWORK_LAYER_BLE
     chip::DeviceLayer::Internal::BLEMgrImpl().ConfigureBle(LinuxDeviceOptions::GetInstance().mBleDevice, false);
 #endif
 

diff --git a/src/controller/python/BUILD.gn b/src/controller/python/BUILD.gn
@@ -100,6 +100,12 @@ pw_python_action("python") {
         "chip/ChipStack.py",
         "chip/ChipUtility.py",
         "chip/__init__.py",
+        "chip/ble/__init__.py",
+        "chip/ble/commissioning/__init__.py",
+        "chip/ble/get_adapters.py",
+        "chip/ble/library_handle.py",
+        "chip/ble/scan_devices.py",
+        "chip/ble/types.py",
         "chip/configuration/__init__.py",
         "chip/exceptions/__init__.py",
         "chip/internal/__init__.py",
@@ -123,22 +129,6 @@ pw_python_action("python") {
     },
   ]
 
-  if (chip_enable_ble) {
-    _py_manifest_files += [
-      {
-        src_dir = "."
-        sources = [
-          "chip/ble/__init__.py",
-          "chip/ble/commissioning/__init__.py",
-          "chip/ble/get_adapters.py",
-          "chip/ble/library_handle.py",
-          "chip/ble/scan_devices.py",
-          "chip/ble/types.py",
-        ]
-      },
-    ]
-  }
-
   _py_manifest_file = "${target_gen_dir}/${target_name}.py_manifest.json"
 
   inputs = []

diff --git a/src/controller/python/build-chip-wheel.py b/src/controller/python/build-chip-wheel.py
@@ -126,6 +126,8 @@ def finalize_options(self):
     #
     packages=[
             'chip',
+            'chip.ble',
+            'chip.ble.commissioning',
             'chip.configuration',
             'chip.exceptions',
             'chip.internal',
@@ -134,10 +136,6 @@ def finalize_options(self):
             'chip.tlv',
     ]
 
-    if os.path.isdir(os.path.join(tmpDir, 'chip', 'ble')):
-      packages += ['chip.ble']
-      packages += ['chip.ble.commissioning']
-
     # Invoke the setuptools 'bdist_wheel' command to generate a wheel containing
     # the CHIP python packages, shared libraries and scripts.
     setup(