openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-11-23 08:49:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add fix adapter

Browse Source 
Signed-off-by: ma-haoyun <mahaoyun2@huawei.com>
This commit is contained in:
ma-haoyun 2024-05-10 11:37:13 +08:00
parent 0ee3a30def
commit 82ac596115
8 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
adapter/BUILD.gn
View File

@ -264,18 +264,6 @@ if (defined(ohos_lite)) {
"$ble_enhanced_impl",
],
"value")
if (enhanced_range) {
include_dirs += [
"$dsoftbus_root_path/dsoftbus_enhance/adapter/common/mlps/include",
"$dsoftbus_root_path/dsoftbus_enhance/core/bus_center/lnn/lane_hub/mlps/include",
"$dsoftbus_root_path/dsoftbus_enhance/core/bus_center/lnn/lane_hub/mlps/interface",
]
sources += [
"$dsoftbus_root_path/dsoftbus_enhance/adapter/common/mlps/src/softbus_adapter_mlps.cpp",
"$dsoftbus_root_path/dsoftbus_enhance/core/bus_center/lnn/lane_hub/mlps/src/mlps.cpp",
]
}
if (enhanced_range && defined(global_parts_info.msdp_algorithm)) {
sources += [ "$dsoftbus_root_path/dsoftbus_enhance/adapter/common/range/softbus_adapter_range.c" ]
external_deps += [ "algorithm:msdp_ble_range" ]

14
core/bus_center/bus_center_server.gni
View File

@ -129,6 +129,20 @@ if (agcr_enhanced) {
bus_center_server_inc += agcr_inc
}
lnn_lp_dir = "dsoftbus_enhance/adapter/common/mlps/src"
lnn_lp_enhanced = exec_script("$dsoftbus_root_path/check_sub_module.py",
[
"$native_source_path",
"$lnn_lp_dir",
],
"value")
if (lnn_lp_enhanced) {
import("../../dsoftbus_enhance/adapter/common/adapter_mlps.gni")
bus_center_server_inc += adapter_mlps_inc
bus_center_server_src += adapter_mlps_src
}
route_dir = "dsoftbus_enhance/components/newip/route"
route_enhanced = exec_script("$dsoftbus_root_path/check_sub_module.py",
[

2
core/bus_center/lnn/lane_hub/lane_hub.gni
View File

@ -148,7 +148,7 @@ if (enhanced) {
lane_channel_rating_src_path = "$dsoftbus_root_path/dsoftbus_enhance/core/bus_center/lnn/lane_hub/lane_channel_rating"
bus_center_hub_inc += [
"$lane_channel_rating_src_path/include",
"$dsoftbus_root_path/dsoftbus_enhance/adapter/common/mlps/include",
"$dsoftbus_root_path/dsoftbus_enhance/adapter/common/mlps/interface",
]
bus_center_hub_src += [
"$lane_channel_rating_src_path/src/channel_rating_v2.c",

2
core/bus_center/lnn/net_builder/net_builder.gni
View File

@ -56,7 +56,7 @@ if (dsoftbus_feature_lnn_net) {
"$dsoftbus_root_path/dsoftbus_enhance/core/bus_center/lnn/net_builder/fast_online/lnn_secure_storage.c",
]
bus_center_builder_inc =
[ "$dsoftbus_root_path/dsoftbus_enhance/adapter/common/mlps/include" ]
[ "$dsoftbus_root_path/dsoftbus_enhance/adapter/common/mlps/interface" ]
}
} else {
bus_center_builder_src = [

6
dsoftbus.gni
View File

@ -30,6 +30,7 @@ declare_args() {
softbus_communication_wifi_feature = true
softbus_os_account = true
dsoftbus_feature_lnn_cloud_sync = true
softbus_lnn_lp_feature = true
}
if (defined(global_parts_info) &&
@ -54,6 +55,11 @@ if (defined(global_parts_info) &&
support_bluetooth = true
}
if (defined(global_parts_info) &&
!defined(global_parts_info.resourceschedule_device_standby_ext)) {
softbus_lnn_lp_feature = false
}
if (defined(ohos_lite)) {
import("//build/lite/config/component/lite_component.gni")
if (ohos_kernel_type == "liteos_m") {

2
tests/core/bus_center/lnn/BUILD.gn
View File

@ -1753,7 +1753,7 @@ if (!defined(ohos_lite) && enhanced_test) {
"$dsoftbus_root_path/core/bus_center/lnn/net_ledger/decision_db/include",
"$dsoftbus_root_path/adapter/common/net/bluetooth/include",
"$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/interface",
"$dsoftbus_root_path/dsoftbus_enhance/adapter/common/mlps/include",
"$dsoftbus_root_path/dsoftbus_enhance/adapter/common/mlps/interface",
]
include_dirs += bus_center_decision_center_inc

2
tests/core/bus_center/test/BUILD.gn
View File

@ -136,7 +136,7 @@ ohos_unittest("HeartBeatFSMTest") {
"$dsoftbus_root_path/core/common/include",
"$dsoftbus_root_path/core/bus_center/lnn/lane_hub/lane_manager/include",
"$dsoftbus_root_path/core/connection/wifi_direct_cpp",
"$dsoftbus_root_path/dsoftbus_enhance/adapter/common/mlps/include",
"$dsoftbus_root_path/dsoftbus_enhance/adapter/common/mlps/interface",
"$dsoftbus_root_path/interfaces/inner_kits/lnn",
"$dsoftbus_root_path/interfaces/kits/discovery",
]

3
tests/core/common/dfx/anonymize/fuzztest/softbusdfxanonymize_fuzzer/BUILD.gn
View File

@ -24,8 +24,7 @@ dsoftbus_root_path = "../../../../../../.."
ohos_fuzztest("SoftBusDfxAnonymizeFuzzTest") {
module_out_path = dsoftbus_fuzz_out_path
fuzz_config_file =
"$dsoftbus_root_path/tests/core/common/dfx/anonymize/fuzztest/softbusdfxanonymize_fuzzer"
fuzz_config_file = "$dsoftbus_root_path/tests/core/common/dfx/anonymize/fuzztest/softbusdfxanonymize_fuzzer"
sources = [ "softbusdfxanonymize_fuzzer.cpp" ]