From e609d5670ce7550b39c79dd63d6c874ab0091284 Mon Sep 17 00:00:00 2001 From: lwx1285820 Date: Thu, 22 Aug 2024 08:06:22 +0000 Subject: [PATCH] fixgn Signed-off-by: lwx1285820 --- intention/dfx/BUILD.gn | 6 ++---- libs/BUILD.gn | 1 - services/BUILD.gn | 4 +--- services/interaction/drag/BUILD.gn | 2 -- test/fuzztest/activatecooperate_fuzzer/BUILD.gn | 2 +- .../fuzztest/activatecoordination_fuzzer/BUILD.gn | 2 +- test/fuzztest/adddraglistener_fuzzer/BUILD.gn | 1 - test/fuzztest/addhotarealistener_fuzzer/BUILD.gn | 1 - test/fuzztest/addprivilegestub_fuzzer/BUILD.gn | 1 - test/fuzztest/deactivatecooperate_fuzzer/BUILD.gn | 2 +- .../deactivatecoordination_fuzzer/BUILD.gn | 2 +- test/fuzztest/devicegetcachestub_fuzzer/BUILD.gn | 2 +- test/fuzztest/devicemanager_fuzzer/BUILD.gn | 2 +- test/fuzztest/devicesubscribestub_fuzzer/BUILD.gn | 2 +- .../deviceunsubscribestub_fuzzer/BUILD.gn | 2 +- test/fuzztest/dsoftbusadapter_fuzzer/BUILD.gn | 1 - test/fuzztest/getcooperatestate_fuzzer/BUILD.gn | 2 +- .../fuzztest/getcoordinationstate_fuzzer/BUILD.gn | 2 +- test/fuzztest/getdragtargetpid_fuzzer/BUILD.gn | 1 - test/fuzztest/getshadowoffset_fuzzer/BUILD.gn | 1 - test/fuzztest/getudkey_fuzzer/BUILD.gn | 2 +- test/fuzztest/handleallocsocketfd_fuzzer/BUILD.gn | 2 +- test/fuzztest/ipcsocket_fuzzer/BUILD.gn | 2 +- test/fuzztest/preparecooperate_fuzzer/BUILD.gn | 2 +- test/fuzztest/preparecoordination_fuzzer/BUILD.gn | 2 +- .../registercooperatemonitor_fuzzer/BUILD.gn | 2 +- .../registercoordinationlistener_fuzzer/BUILD.gn | 2 +- test/fuzztest/removedraglistener_fuzzer/BUILD.gn | 1 - .../removehotarealistener_fuzzer/BUILD.gn | 1 - .../fuzztest/setdragwindowvisible_fuzzer/BUILD.gn | 1 - test/fuzztest/startdrag_fuzzer/BUILD.gn | 1 - test/fuzztest/stopdrag_fuzzer/BUILD.gn | 1 - test/fuzztest/unpreparecooperate_fuzzer/BUILD.gn | 2 +- .../unpreparecoordination_fuzzer/BUILD.gn | 2 +- .../unregistercooperatemonitor_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- test/fuzztest/updatedragstyle_fuzzer/BUILD.gn | 1 - test/fuzztest/updatepreviewstyle_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 2 +- test/fuzztest/updateshadowpic_fuzzer/BUILD.gn | 1 - test/unittest/intention/common/BUILD.gn | 4 ++-- test/unittest/intention/cooperate/BUILD.gn | 4 ++-- test/unittest/intention/scheduler/BUILD.gn | 2 +- test/unittest/intention/services/BUILD.gn | 4 ++-- test/unittest/interfaces/BUILD.gn | 3 +-- test/unittest/libs/BUILD.gn | 9 +++------ test/unittest/services/moduletest/BUILD.gn | 3 +-- test/unittest/services/unittest/BUILD.gn | 7 +++---- tools/vdev/BUILD.gn | 15 +++------------ 49 files changed, 43 insertions(+), 79 deletions(-) diff --git a/intention/dfx/BUILD.gn b/intention/dfx/BUILD.gn index aaa144330..48643267d 100644 --- a/intention/dfx/BUILD.gn +++ b/intention/dfx/BUILD.gn @@ -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", ] diff --git a/libs/BUILD.gn b/libs/BUILD.gn index fb7548a94..2ee0be37e 100755 --- a/libs/BUILD.gn +++ b/libs/BUILD.gn @@ -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 = [ diff --git a/services/BUILD.gn b/services/BUILD.gn index 6b1c8fbfc..49c16dc14 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -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" ] diff --git a/services/interaction/drag/BUILD.gn b/services/interaction/drag/BUILD.gn index 5d587de95..f9fbee37f 100644 --- a/services/interaction/drag/BUILD.gn +++ b/services/interaction/drag/BUILD.gn @@ -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", diff --git a/test/fuzztest/activatecooperate_fuzzer/BUILD.gn b/test/fuzztest/activatecooperate_fuzzer/BUILD.gn index 301e85dce..104333001 100644 --- a/test/fuzztest/activatecooperate_fuzzer/BUILD.gn +++ b/test/fuzztest/activatecooperate_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/activatecoordination_fuzzer/BUILD.gn b/test/fuzztest/activatecoordination_fuzzer/BUILD.gn index 2725e4f7d..622e99732 100644 --- a/test/fuzztest/activatecoordination_fuzzer/BUILD.gn +++ b/test/fuzztest/activatecoordination_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/adddraglistener_fuzzer/BUILD.gn b/test/fuzztest/adddraglistener_fuzzer/BUILD.gn index 7c7f24079..216b3dbc6 100644 --- a/test/fuzztest/adddraglistener_fuzzer/BUILD.gn +++ b/test/fuzztest/adddraglistener_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/addhotarealistener_fuzzer/BUILD.gn b/test/fuzztest/addhotarealistener_fuzzer/BUILD.gn index 1985e79f5..784ebadd8 100644 --- a/test/fuzztest/addhotarealistener_fuzzer/BUILD.gn +++ b/test/fuzztest/addhotarealistener_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/addprivilegestub_fuzzer/BUILD.gn b/test/fuzztest/addprivilegestub_fuzzer/BUILD.gn index 21a389905..c03040866 100644 --- a/test/fuzztest/addprivilegestub_fuzzer/BUILD.gn +++ b/test/fuzztest/addprivilegestub_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/deactivatecooperate_fuzzer/BUILD.gn b/test/fuzztest/deactivatecooperate_fuzzer/BUILD.gn index 483b68fd0..68450b996 100644 --- a/test/fuzztest/deactivatecooperate_fuzzer/BUILD.gn +++ b/test/fuzztest/deactivatecooperate_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/deactivatecoordination_fuzzer/BUILD.gn b/test/fuzztest/deactivatecoordination_fuzzer/BUILD.gn index 9e659bcf9..6df650074 100644 --- a/test/fuzztest/deactivatecoordination_fuzzer/BUILD.gn +++ b/test/fuzztest/deactivatecoordination_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/devicegetcachestub_fuzzer/BUILD.gn b/test/fuzztest/devicegetcachestub_fuzzer/BUILD.gn index 8827e35a1..8e429d505 100644 --- a/test/fuzztest/devicegetcachestub_fuzzer/BUILD.gn +++ b/test/fuzztest/devicegetcachestub_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/devicemanager_fuzzer/BUILD.gn b/test/fuzztest/devicemanager_fuzzer/BUILD.gn index a1abf2ffd..dbf445420 100644 --- a/test/fuzztest/devicemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanager_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/devicesubscribestub_fuzzer/BUILD.gn b/test/fuzztest/devicesubscribestub_fuzzer/BUILD.gn index cfa1a12a6..df05d8c66 100644 --- a/test/fuzztest/devicesubscribestub_fuzzer/BUILD.gn +++ b/test/fuzztest/devicesubscribestub_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/deviceunsubscribestub_fuzzer/BUILD.gn b/test/fuzztest/deviceunsubscribestub_fuzzer/BUILD.gn index 2537677af..d351d4ee1 100644 --- a/test/fuzztest/deviceunsubscribestub_fuzzer/BUILD.gn +++ b/test/fuzztest/deviceunsubscribestub_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/dsoftbusadapter_fuzzer/BUILD.gn b/test/fuzztest/dsoftbusadapter_fuzzer/BUILD.gn index d32fb9e7b..cccd6d74c 100644 --- a/test/fuzztest/dsoftbusadapter_fuzzer/BUILD.gn +++ b/test/fuzztest/dsoftbusadapter_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/getcooperatestate_fuzzer/BUILD.gn b/test/fuzztest/getcooperatestate_fuzzer/BUILD.gn index 5bcd5ae66..48ce87b85 100644 --- a/test/fuzztest/getcooperatestate_fuzzer/BUILD.gn +++ b/test/fuzztest/getcooperatestate_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/getcoordinationstate_fuzzer/BUILD.gn b/test/fuzztest/getcoordinationstate_fuzzer/BUILD.gn index d063be33b..9bc7601fa 100644 --- a/test/fuzztest/getcoordinationstate_fuzzer/BUILD.gn +++ b/test/fuzztest/getcoordinationstate_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/getdragtargetpid_fuzzer/BUILD.gn b/test/fuzztest/getdragtargetpid_fuzzer/BUILD.gn index b06be14dd..24b4d8deb 100644 --- a/test/fuzztest/getdragtargetpid_fuzzer/BUILD.gn +++ b/test/fuzztest/getdragtargetpid_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/getshadowoffset_fuzzer/BUILD.gn b/test/fuzztest/getshadowoffset_fuzzer/BUILD.gn index e66879743..877d5667d 100644 --- a/test/fuzztest/getshadowoffset_fuzzer/BUILD.gn +++ b/test/fuzztest/getshadowoffset_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/getudkey_fuzzer/BUILD.gn b/test/fuzztest/getudkey_fuzzer/BUILD.gn index 8c2ddfff6..5add0f1c2 100644 --- a/test/fuzztest/getudkey_fuzzer/BUILD.gn +++ b/test/fuzztest/getudkey_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/handleallocsocketfd_fuzzer/BUILD.gn b/test/fuzztest/handleallocsocketfd_fuzzer/BUILD.gn index dde78f849..d2636c854 100644 --- a/test/fuzztest/handleallocsocketfd_fuzzer/BUILD.gn +++ b/test/fuzztest/handleallocsocketfd_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/ipcsocket_fuzzer/BUILD.gn b/test/fuzztest/ipcsocket_fuzzer/BUILD.gn index b65cf778d..35c051177 100644 --- a/test/fuzztest/ipcsocket_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcsocket_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/preparecooperate_fuzzer/BUILD.gn b/test/fuzztest/preparecooperate_fuzzer/BUILD.gn index 009ae053a..5c7b4c52e 100644 --- a/test/fuzztest/preparecooperate_fuzzer/BUILD.gn +++ b/test/fuzztest/preparecooperate_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/preparecoordination_fuzzer/BUILD.gn b/test/fuzztest/preparecoordination_fuzzer/BUILD.gn index 235de378e..dcca27cbc 100644 --- a/test/fuzztest/preparecoordination_fuzzer/BUILD.gn +++ b/test/fuzztest/preparecoordination_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/registercooperatemonitor_fuzzer/BUILD.gn b/test/fuzztest/registercooperatemonitor_fuzzer/BUILD.gn index f8827e00f..506167182 100644 --- a/test/fuzztest/registercooperatemonitor_fuzzer/BUILD.gn +++ b/test/fuzztest/registercooperatemonitor_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/registercoordinationlistener_fuzzer/BUILD.gn b/test/fuzztest/registercoordinationlistener_fuzzer/BUILD.gn index 6a05fd592..8b5462c75 100644 --- a/test/fuzztest/registercoordinationlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/registercoordinationlistener_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/removedraglistener_fuzzer/BUILD.gn b/test/fuzztest/removedraglistener_fuzzer/BUILD.gn index 41b57bd13..f9392a4b5 100644 --- a/test/fuzztest/removedraglistener_fuzzer/BUILD.gn +++ b/test/fuzztest/removedraglistener_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/removehotarealistener_fuzzer/BUILD.gn b/test/fuzztest/removehotarealistener_fuzzer/BUILD.gn index 8e00c5e07..fe6ab8672 100644 --- a/test/fuzztest/removehotarealistener_fuzzer/BUILD.gn +++ b/test/fuzztest/removehotarealistener_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/setdragwindowvisible_fuzzer/BUILD.gn b/test/fuzztest/setdragwindowvisible_fuzzer/BUILD.gn index b6224487d..34e553c6f 100644 --- a/test/fuzztest/setdragwindowvisible_fuzzer/BUILD.gn +++ b/test/fuzztest/setdragwindowvisible_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/startdrag_fuzzer/BUILD.gn b/test/fuzztest/startdrag_fuzzer/BUILD.gn index 63402164c..2d8019c78 100644 --- a/test/fuzztest/startdrag_fuzzer/BUILD.gn +++ b/test/fuzztest/startdrag_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/stopdrag_fuzzer/BUILD.gn b/test/fuzztest/stopdrag_fuzzer/BUILD.gn index 3231ec340..ad59f5488 100644 --- a/test/fuzztest/stopdrag_fuzzer/BUILD.gn +++ b/test/fuzztest/stopdrag_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/unpreparecooperate_fuzzer/BUILD.gn b/test/fuzztest/unpreparecooperate_fuzzer/BUILD.gn index 50e03e811..b5567787b 100644 --- a/test/fuzztest/unpreparecooperate_fuzzer/BUILD.gn +++ b/test/fuzztest/unpreparecooperate_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/unpreparecoordination_fuzzer/BUILD.gn b/test/fuzztest/unpreparecoordination_fuzzer/BUILD.gn index fd56b407e..1369107dd 100644 --- a/test/fuzztest/unpreparecoordination_fuzzer/BUILD.gn +++ b/test/fuzztest/unpreparecoordination_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/unregistercooperatemonitor_fuzzer/BUILD.gn b/test/fuzztest/unregistercooperatemonitor_fuzzer/BUILD.gn index df37f9606..3263a22b7 100644 --- a/test/fuzztest/unregistercooperatemonitor_fuzzer/BUILD.gn +++ b/test/fuzztest/unregistercooperatemonitor_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/unregistercoordinationlistener_fuzzer/BUILD.gn b/test/fuzztest/unregistercoordinationlistener_fuzzer/BUILD.gn index 5d83feae4..20a98f63c 100644 --- a/test/fuzztest/unregistercoordinationlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/unregistercoordinationlistener_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/updatedragstyle_fuzzer/BUILD.gn b/test/fuzztest/updatedragstyle_fuzzer/BUILD.gn index 688ffb0e4..349fba4d2 100644 --- a/test/fuzztest/updatedragstyle_fuzzer/BUILD.gn +++ b/test/fuzztest/updatedragstyle_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/updatepreviewstyle_fuzzer/BUILD.gn b/test/fuzztest/updatepreviewstyle_fuzzer/BUILD.gn index 12620964a..7fa8f8ff2 100644 --- a/test/fuzztest/updatepreviewstyle_fuzzer/BUILD.gn +++ b/test/fuzztest/updatepreviewstyle_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/updatepreviewstylewithanimationstub_fuzzer/BUILD.gn b/test/fuzztest/updatepreviewstylewithanimationstub_fuzzer/BUILD.gn index a5a3401b2..8fd595701 100644 --- a/test/fuzztest/updatepreviewstylewithanimationstub_fuzzer/BUILD.gn +++ b/test/fuzztest/updatepreviewstylewithanimationstub_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/fuzztest/updateshadowpic_fuzzer/BUILD.gn b/test/fuzztest/updateshadowpic_fuzzer/BUILD.gn index fdd9373b7..b93c4481c 100644 --- a/test/fuzztest/updateshadowpic_fuzzer/BUILD.gn +++ b/test/fuzztest/updateshadowpic_fuzzer/BUILD.gn @@ -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 = [ diff --git a/test/unittest/intention/common/BUILD.gn b/test/unittest/intention/common/BUILD.gn index 2e42aafbd..d75755f4b 100644 --- a/test/unittest/intention/common/BUILD.gn +++ b/test/unittest/intention/common/BUILD.gn @@ -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", ] } diff --git a/test/unittest/intention/cooperate/BUILD.gn b/test/unittest/intention/cooperate/BUILD.gn index 77d076d8e..9c09df517 100644 --- a/test/unittest/intention/cooperate/BUILD.gn +++ b/test/unittest/intention/cooperate/BUILD.gn @@ -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", diff --git a/test/unittest/intention/scheduler/BUILD.gn b/test/unittest/intention/scheduler/BUILD.gn index d6efc3a9f..08e0a711b 100644 --- a/test/unittest/intention/scheduler/BUILD.gn +++ b/test/unittest/intention/scheduler/BUILD.gn @@ -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", diff --git a/test/unittest/intention/services/BUILD.gn b/test/unittest/intention/services/BUILD.gn index 716576c51..d5bd1cde6 100644 --- a/test/unittest/intention/services/BUILD.gn +++ b/test/unittest/intention/services/BUILD.gn @@ -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", diff --git a/test/unittest/interfaces/BUILD.gn b/test/unittest/interfaces/BUILD.gn index 168a09ce1..53e17a167 100644 --- a/test/unittest/interfaces/BUILD.gn +++ b/test/unittest/interfaces/BUILD.gn @@ -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", diff --git a/test/unittest/libs/BUILD.gn b/test/unittest/libs/BUILD.gn index 4ef557120..2b4b593f5 100644 --- a/test/unittest/libs/BUILD.gn +++ b/test/unittest/libs/BUILD.gn @@ -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", diff --git a/test/unittest/services/moduletest/BUILD.gn b/test/unittest/services/moduletest/BUILD.gn index 84f4bbcf8..2f3c30b32 100644 --- a/test/unittest/services/moduletest/BUILD.gn +++ b/test/unittest/services/moduletest/BUILD.gn @@ -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", diff --git a/test/unittest/services/unittest/BUILD.gn b/test/unittest/services/unittest/BUILD.gn index 007bb3678..637696686 100644 --- a/test/unittest/services/unittest/BUILD.gn +++ b/test/unittest/services/unittest/BUILD.gn @@ -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", diff --git a/tools/vdev/BUILD.gn b/tools/vdev/BUILD.gn index 609092c9d..636174af7 100644 --- a/tools/vdev/BUILD.gn +++ b/tools/vdev/BUILD.gn @@ -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" ]