Signed-off-by: hewanglon <hewanglong@huawei.com>
Change-Id: If8f4b8dca2284ba2af0783fb877d5e78794772fb
This commit is contained in:
hewanglon 2023-11-11 05:13:52 +00:00
parent 29559b7c0e
commit b0102d2dd0
17 changed files with 23 additions and 22 deletions

View File

@ -31,7 +31,7 @@ ohos_shared_library("stationary") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [
"${device_status_frameworks_path}/js/napi/src/devicestatus_event.cpp",

View File

@ -17,7 +17,7 @@ ohos_shared_library("inputdevicecooperate") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [

View File

@ -17,7 +17,7 @@ ohos_shared_library("cooperate") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [

View File

@ -17,7 +17,7 @@ ohos_shared_library("draginteraction") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [

View File

@ -27,7 +27,7 @@ ohos_shared_library("deviceagent") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [ "./devicestatus_agent.cpp" ]

View File

@ -36,7 +36,7 @@ ohos_shared_library("devicestatus_client") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
version_script = "libdevicestatus_client_map"

View File

@ -30,7 +30,7 @@ ohos_shared_library("devicestatus_mock") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [
@ -64,7 +64,7 @@ ohos_shared_library("devicestatus_algo") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [
"src/algorithm/algo_absolute_still.cpp",

View File

@ -33,7 +33,7 @@ ohos_shared_library("fusion_data_binding") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [ "src/fusion_data_binding.cpp" ]

View File

@ -30,7 +30,7 @@ ohos_shared_library("fusion_services_binding") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [ "src/fusion_services_binding.cpp" ]

View File

@ -30,7 +30,7 @@ ohos_shared_library("fusion_subsystem_binding") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [ "multimedia/src/fusion_image_framework.cpp" ]

View File

@ -82,7 +82,7 @@ ohos_shared_library("devicestatus_service") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
shlib_type = "sa"
@ -132,7 +132,7 @@ ohos_static_library("devicestatus_static_service") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
include_dirs = [ "//third_party/cJSON" ]

View File

@ -21,7 +21,7 @@ ohos_shared_library("coordination") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
include_dirs = [

View File

@ -21,7 +21,7 @@ ohos_shared_library("interaction_drag") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
include_dirs = [

View File

@ -84,7 +84,7 @@ void DeviceStatusService::OnStart()
return;
}
#ifndef OHOS_BUILD_ENABLE_RUST_IMPL
if (!Publish(this)) {
if (!Publish(DelayedSpSingleton<DeviceStatusService>::GetInstance())) {
FI_HILOGE("On start register to system ability manager failed");
return;
}
@ -167,7 +167,8 @@ bool DeviceStatusService::Init()
CALL_DEBUG_ENTER;
if (devicestatusManager_ == nullptr) {
FI_HILOGW("devicestatusManager_ is nullptr");
devicestatusManager_ = std::make_shared<DeviceStatusManager>(this);
auto ms = DelayedSpSingleton<DeviceStatusService>::GetInstance();
devicestatusManager_ = std::make_shared<DeviceStatusManager>(ms);
}
if (!devicestatusManager_->Init()) {
FI_HILOGE("OnStart init failed");

View File

@ -28,7 +28,7 @@ ohos_source_set("devicestatus_vdev") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [
@ -71,7 +71,7 @@ ohos_source_set("devicestatus_vdev_builders") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [
@ -105,7 +105,7 @@ ohos_executable("vdevadm") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
include_dirs = [

View File

@ -31,7 +31,7 @@ ohos_shared_library("devicestatus_util") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
version_script = "libdevicestatus_util_map"

View File

@ -25,7 +25,7 @@ ohos_shared_library("devicestatus_ipc") {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = true
debug = false
}
sources = [