Signed-off-by: lwx1285820 <lishaoxiong10@huawei.com>
This commit is contained in:
lwx1285820 2024-08-22 08:06:22 +00:00
parent f16f5793c9
commit e609d5670c
49 changed files with 43 additions and 79 deletions

View File

@ -30,10 +30,7 @@ ohos_source_set("cooperate_dfx") {
branch_protector_ret = "pac_ret"
include_dirs = [
"include",
"/third_party/cJSON",
]
include_dirs = [ "include" ]
sources = [ "src/cooperate_hisysevent.cpp" ]
@ -45,6 +42,7 @@ ohos_source_set("cooperate_dfx") {
external_deps = [
"c_utils:utils",
"cJSON:cjson",
"hilog:libhilog",
"hisysevent:libhisysevent",
]

View File

@ -85,7 +85,6 @@ ohos_shared_library("devicestatus_algo") {
deps = [
"${device_status_interfaces_path}/innerkits:devicestatus_client",
"${device_status_utils_path}:devicestatus_util",
"//third_party/jsoncpp",
]
external_deps = [

View File

@ -68,6 +68,7 @@ external_deps_set = [
"ability_runtime:app_manager",
"access_token:libaccesstoken_sdk",
"access_token:libtokenid_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:librender_service_client",
"graphic_2d:window_animation",
@ -94,7 +95,6 @@ ohos_shared_library("devicestatus_service") {
branch_protector_ret = "pac_ret"
shlib_type = "sa"
include_dirs = [ "//third_party/cJSON" ]
sources = sources_set
@ -168,8 +168,6 @@ ohos_static_library("devicestatus_static_service") {
debug = false
}
include_dirs = [ "//third_party/cJSON" ]
sources = sources_set
configs = [ ":devicestatus_services_private_config" ]

View File

@ -43,7 +43,6 @@ if (!is_arkui_x) {
"${device_status_service_path}/context/include",
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/native/include",
"//third_party/cJSON",
]
sources = [
@ -117,7 +116,6 @@ if (!is_arkui_x) {
} else {
ohos_source_set("interaction_client_crossplatform") {
include_dirs = [
"//third_party/cJSON",
"${device_status_root_path}/interfaces/innerkits/interaction/include",
"${device_status_root_path}/intention/prototype/include",
"${device_status_root_path}/services/interaction/drag/include",

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:librender_service_client",
@ -43,7 +44,6 @@ ohos_fuzztest("ActivateCooperateFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:librender_service_client",
@ -43,7 +44,6 @@ ohos_fuzztest("ActivateCoordinationFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("AddDragListenerFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("AddHotAreaListenerFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("AddPrivilegeStubFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("DeactivateCooperateFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("DeactivateCoordinationFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -23,6 +23,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -46,7 +47,6 @@ ohos_fuzztest("DevicegetcachestubFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("DeviceManagerFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -23,6 +23,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -46,7 +47,6 @@ ohos_fuzztest("DevicesubscribestubFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -23,6 +23,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -46,7 +47,6 @@ ohos_fuzztest("DeviceunsubscribestubFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -42,7 +42,6 @@ ohos_fuzztest("DsoftbusAdapterFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("GetCooperateStateFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("GetCoordinationStateFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("GetDragTargetPidFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("GetShadowOffsetFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -42,7 +43,6 @@ ohos_fuzztest("GetUdKeyFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("HandleAllocSocketFdFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -42,7 +43,6 @@ ohos_fuzztest("IpcSocketFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("PrepareCooperateFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("PrepareCoordinationFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("RegisterCooperateMonitorFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -42,7 +43,6 @@ ohos_fuzztest("RegisterCoordinationListenerFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("RemoveDraglistenerFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("RemoveHotAreaListenerFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("SetDragWindowVisibleFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("StartDragFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("StopDragFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("UnPrepareCooperateFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -43,7 +44,6 @@ ohos_fuzztest("UnPrepareCoordinationFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -42,7 +43,6 @@ ohos_fuzztest("UnregisterCooperateMonitorFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -42,7 +43,6 @@ ohos_fuzztest("UnRegisterCoordinationListenerFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("UpdateDragStyleFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -45,7 +45,6 @@ ohos_fuzztest("UpdatePreviewStyleFuzzTest") {
"${device_status_service_path}/interaction/coordination/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -20,6 +20,7 @@ deps_ex = [
"ability_runtime:app_manager",
"device_manager:devicemanagersdk",
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:libcomposer",
"graphic_2d:window_animation",
@ -42,7 +43,6 @@ ohos_fuzztest("UpdatePreviewStyleWithAnimationStubFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -44,7 +44,6 @@ ohos_fuzztest("UpdateShadowPicFuzzTest") {
"${device_status_service_path}/interaction/drag/include",
"${device_status_service_path}/communication/service/include",
"${device_status_utils_path}/include",
"//third_party/cJSON",
]
cflags = [

View File

@ -54,11 +54,11 @@ ohos_unittest("EpollManagerTest") {
"${device_status_root_path}/intention/common/epoll:intention_epoll",
"${device_status_root_path}/utils/common:devicestatus_util",
"${device_status_utils_path}:devicestatus_util",
"//third_party/googletest:gtest_main",
]
external_deps = [
external_deps = [
"c_utils:utils",
"googletest:gtest_main",
"hilog:libhilog",
]
}

View File

@ -56,8 +56,6 @@ ohos_unittest("CooperateClientTest") {
"${device_status_root_path}/intention/prototype:intention_prototype",
"${device_status_root_path}/utils/common:devicestatus_util",
"${device_status_root_path}/utils/ipc:devicestatus_ipc",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
]
external_deps = [
"access_token:libaccesstoken_sdk",
@ -65,6 +63,8 @@ ohos_unittest("CooperateClientTest") {
"access_token:libtokensetproc_shared",
"c_utils:utils",
"eventhandler:libeventhandler",
"googletest:gmock_main",
"googletest:gtest_main",
"hilog:libhilog",
"hitrace:hitrace_meter",
"image_framework:image_native",

View File

@ -63,7 +63,6 @@ ohos_unittest("TimerManagerTest") {
"${device_status_root_path}/utils/ipc:devicestatus_ipc",
"${device_status_service_path}/interaction/drag:interaction_drag",
"${device_status_utils_path}:devicestatus_util",
"//third_party/googletest:gtest_main",
]
external_deps = [
@ -74,6 +73,7 @@ ohos_unittest("TimerManagerTest") {
"device_info_manager:distributed_device_profile_client",
"device_manager:devicemanagersdk",
"distributed_input:libdinput_sdk",
"googletest:gtest_main",
"graphic_2d:libcomposer",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",

View File

@ -67,7 +67,6 @@ ohos_unittest("IntentionServiceTest") {
"${device_status_root_path}/services:devicestatus_static_service",
"${device_status_root_path}/utils/common:devicestatus_util",
"${device_status_root_path}/utils/ipc:devicestatus_ipc",
"//third_party/googletest:gtest_main",
]
if (device_status_intention_framework) {
@ -84,6 +83,7 @@ ohos_unittest("IntentionServiceTest") {
"cJSON:cjson",
"c_utils:utils",
"device_manager:devicemanagersdk",
"googletest:gtest_main",
"graphic_2d:libcomposer",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
@ -254,7 +254,6 @@ ohos_unittest("IntentionDeviceManagerTest") {
"${device_status_root_path}/services/interaction/drag:interaction_drag",
"${device_status_root_path}/utils/common:devicestatus_util",
"${device_status_root_path}/utils/ipc:devicestatus_ipc",
"//third_party/googletest:gtest_main",
]
external_deps = [
@ -262,6 +261,7 @@ ohos_unittest("IntentionDeviceManagerTest") {
"access_token:libaccesstoken_sdk",
"cJSON:cjson",
"c_utils:utils",
"googletest:gtest_main",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"graphic_2d:window_animation",

View File

@ -33,10 +33,8 @@ ohos_systemtest("DeviceStatusClientTest") {
]
deps = [
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
"${device_status_frameworks_path}/js/napi:stationary",
"${device_status_interfaces_path}/innerkits:devicestatus_client",
"//third_party/googletest:gtest_main",
]
external_deps = [
@ -48,6 +46,7 @@ ohos_systemtest("DeviceStatusClientTest") {
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler",
"googletest:gtest_main",
"hilog:libhilog",
"image_framework:image_native",
"ipc:ipc_single",

View File

@ -47,8 +47,6 @@ ohos_unittest("device_status_algorithm_test") {
"${device_status_interfaces_path}/innerkits:devicestatus_client",
"${device_status_root_path}/services:devicestatus_static_service",
"../../../libs:devicestatus_algo",
"//third_party/googletest:gtest_main",
"//third_party/jsoncpp",
]
external_deps = [
@ -58,6 +56,7 @@ ohos_unittest("device_status_algorithm_test") {
"c_utils:utils",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"googletest:gtest_main",
"image_framework:image_native",
"input:libmmi-client",
"ipc:ipc_single",
@ -87,8 +86,6 @@ ohos_unittest("device_status_datahub_test") {
"${device_status_root_path}/services:devicestatus_static_service",
"../../../libs:devicestatus_algo",
"../../../libs:devicestatus_mock",
"//third_party/googletest:gtest_main",
"//third_party/jsoncpp",
]
external_deps = [
@ -97,6 +94,7 @@ ohos_unittest("device_status_datahub_test") {
"cJSON:cjson_static",
"c_utils:utils",
"hilog:libhilog",
"googletest:gtest_main",
"image_framework:image_native",
"input:libmmi-client",
"ipc:ipc_single",
@ -127,8 +125,6 @@ ohos_unittest("device_status_mock_test") {
"${device_status_root_path}/services:devicestatus_static_service",
"../../../libs:devicestatus_algo",
"../../../libs:devicestatus_mock",
"//third_party/googletest:gtest_main",
"//third_party/jsoncpp",
]
external_deps = [
@ -136,6 +132,7 @@ ohos_unittest("device_status_mock_test") {
"access_token:libaccesstoken_sdk",
"cJSON:cjson_static",
"c_utils:utils",
"googletest:gtest_main",
"hilog:libhilog",
"image_framework:image_native",
"input:libmmi-client",

View File

@ -33,10 +33,8 @@ ohos_moduletest("test_devicestatus_module") {
]
deps = [
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
"${device_status_frameworks_path}/js/napi:stationary",
"${device_status_interfaces_path}/innerkits:devicestatus_client",
"//third_party/googletest:gtest_main",
]
external_deps = [
@ -48,6 +46,7 @@ ohos_moduletest("test_devicestatus_module") {
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler",
"googletest:gtest_main",
"hilog:libhilog",
"image_framework:image_native",
"ipc:ipc_single",

View File

@ -42,10 +42,8 @@ ohos_unittest("test_devicestatus_service") {
]
deps = [
"${ability_runtime_path}/frameworks/native/appkit:appkit_native",
"${device_status_frameworks_path}/js/napi:stationary",
"${device_status_interfaces_path}/innerkits:devicestatus_client",
"//third_party/googletest:gtest_main",
]
external_deps = [
@ -58,6 +56,7 @@ ohos_unittest("test_devicestatus_service") {
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler",
"googletest:gtest_main",
"hilog:libhilog",
"image_framework:image_native",
"input:libmmi-client",
@ -81,11 +80,11 @@ ohos_unittest("DeviceStatusAgentTest") {
deps = [
"../../../../frameworks/native/src:deviceagent",
"//third_party/googletest:gtest_main",
]
external_deps = [
"cJSON:cjson",
"c_utils:utils",
"googletest:gtest_main",
"hilog:libhilog",
"ipc:ipc_single",
"safwk:system_ability_fwk",
@ -115,12 +114,12 @@ ohos_unittest("DragDataManagerTest") {
"${device_status_root_path}/utils/ipc:devicestatus_ipc",
"${device_status_service_path}/interaction/drag:interaction_drag",
"${device_status_utils_path}:devicestatus_util",
"//third_party/googletest:gtest_main",
]
external_deps = [
"cJSON:cjson",
"c_utils:utils",
"googletest:gtest_main",
"graphic_2d:librender_service_client",
"graphic_2d:window_animation",
"hilog:libhilog",

View File

@ -14,10 +14,7 @@
import("../../device_status.gni")
config("devicestatus_vdev_config") {
include_dirs = [
"include",
"//third_party/json/include",
]
include_dirs = [ "include" ]
}
config("devicestatus_vdev_public_config") {
@ -51,10 +48,7 @@ ohos_source_set("devicestatus_vdev") {
}
config("devicestatus_vdev_builders_config") {
include_dirs = [
"include",
"//third_party/json/include",
]
include_dirs = [ "include" ]
}
config("devicestatus_vdev_builders_public_config") {
@ -90,10 +84,7 @@ ohos_source_set("devicestatus_vdev_builders") {
}
ohos_executable("vdevadm") {
include_dirs = [
"include",
"//third_party/json/include",
]
include_dirs = [ "include" ]
sources = [ "src/vdevadm.cpp" ]