Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Followup #1 for #5244. Always add 'chip.ble' modules even if ble is n… #5312

Merged
merged 1 commit into from
Mar 11, 2021
Merged

Followup #1 for #5244. Always add 'chip.ble' modules even if ble is n… #5312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/bridge-app/linux/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/linux/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
22 changes: 6 additions & 16 deletions src/controller/python/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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 = []
Expand Down
6 changes: 2 additions & 4 deletions src/controller/python/build-chip-wheel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ def finalize_options(self):
#
packages=[
'chip',
'chip.ble',
'chip.ble.commissioning',
'chip.configuration',
'chip.exceptions',
'chip.internal',
Expand All @@ -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(
Expand Down