openharmony/distributedhardware_device_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/distributedhardware_device_manager synced 2024-12-04 07:11:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

流水线整改

Browse Source 
Signed-off-by: 李巍 <liwei787@huawei.com>
This commit is contained in:
李巍 2024-11-08 21:20:59 +08:00
parent 558f78c01a
commit 9888181b79
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
device_manager.gni
View File

@ -79,9 +79,10 @@ declare_args() {
}
if (defined(global_parts_info) &&
defined(global_parts_info.distributedhardware_distributed_hardware_adapter)) {
defined(
global_parts_info.distributedhardware_distributed_hardware_adapter)) {
device_manager_common = false
} else {
device_manager_common = true
}
}
}

6
services/service/BUILD.gn
View File

@ -106,11 +106,7 @@ if (defined(ohos_lite)) {
"-Wfloat-equal",
"-Wshadow",
]
if (dm_common) {
cflags += [ "-DDEVICE_MANAGER_COMMON_SWITCH" ]
}
cflags_cc = cflags
}
}

3
services/service/src/device_manager_service.cpp
View File

@ -2017,7 +2017,8 @@ void DeviceManagerService::HandleCredentialAuthStatus(const std::string &deviceL
}
}
int32_t DeviceManagerService::SetLocalDeviceName(const std::string &localDeviceName, const std::string &localDisplayName)
int32_t DeviceManagerService::SetLocalDeviceName(const std::string &localDeviceName,
const std::string &localDisplayName)
{
LOGI("DeviceManagerService Start SetLocalDeviceName!");
CHECK_NULL_RETURN(softbusListener_, ERR_DM_POINT_NULL);

3
services/service/src/softbus/softbus_listener.cpp
View File

@ -688,7 +688,8 @@ int32_t SoftbusListener::GetNetworkIdByUdid(const std::string &udid, std::string
return SoftbusCache::GetInstance().GetNetworkIdFromCache(udid, networkId);
}
int32_t SoftbusListener::SetLocalDeviceName(const std::string &localDeviceName, const std::string &localDisplayName)
int32_t SoftbusListener::SetLocalDeviceName(const std::string &localDeviceName,
const std::string &localDisplayName)
{
LOGI("SoftbusListener Start SetLocalDeviceName!");
#ifdef DDEVICE_MANAGER_COMMON_SWITCH