diff --git a/common/BUILD.gn b/common/BUILD.gn index 65d39eed4de69b7da42a31fc419b60c5918e9e21..74a11957d41f9b11b22a0519a93fe9af5a7df0ff 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -13,15 +13,11 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../distributedscreen.gni") ohos_shared_library("distributed_screen_utils") { include_dirs = [ "${services_path}/common/utils/include", - "//commonlibrary/c_utils/base/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "//third_party/json/include", "${common_path}/include", "${fwk_common_path}/utils/include", @@ -38,8 +34,10 @@ ohos_shared_library("distributed_screen_utils") { external_deps = [ "c_utils:utils", + "c_utils:utilsbase", "dsoftbus:softbus_client", "hisysevent_native:libhisysevent", + "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/common/test/unittest/BUILD.gn b/common/test/unittest/BUILD.gn index 033dd19f2d1addb108d143d726fed4ca0afdf593..6619c93300a791087fbfb6d5478cf81dd697459b 100644 --- a/common/test/unittest/BUILD.gn +++ b/common/test/unittest/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../distributedscreen.gni") module_out_path = "distributed_screen/screen_common_test" @@ -21,9 +20,7 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "./include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", "${common_path}/include", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", ] } diff --git a/distributedscreen.gni b/distributedscreen.gni index e02cbb0fdf29c05bbbd6896f73455f649c0763ee..5049c406ad1002d81d2eb486e12e9e92c65c291b 100644 --- a/distributedscreen.gni +++ b/distributedscreen.gni @@ -15,7 +15,6 @@ distributedscreen_path = "//foundation/distributedhardware/distributed_screen" distributedhardwarefwk_path = "//foundation/distributedhardware/distributed_hardware_fwk" windowmanager_path = "//foundation/window/window_manager" -mediastandard_path = "//foundation/multimedia/player_framework" ipc_path = "//foundation/communication/ipc" graphicstandard_path = "//foundation/graphic/graphic_2d" common_path = "${distributedscreen_path}/common" diff --git a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn index 2f2ddd298ac6fc45bd1b35d0d7609272f85141f5..11b78173b047b282c4b250feedfd800d85c0f2e4 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn @@ -13,15 +13,10 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../distributedscreen.gni") ohos_shared_library("distributed_screen_sink_sdk") { - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn index bf4273800cb586566be6c300707426e28c7847d9..d77689b14fb3a5a4f6dc520df3a0742fb355bd45 100644 --- a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn @@ -13,15 +13,10 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../distributedscreen.gni") ohos_shared_library("distributed_screen_source_sdk") { - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn index 52d2f87106087502db05b004dc7b3466dd1f712a..079aecfc118a12b80829f79702e2cf9f0dbd8cf8 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("HandlerInitSinkFuzzTest") { @@ -23,16 +22,12 @@ ohos_fuzztest("HandlerInitSinkFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", "${common_path}/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] cflags = [ @@ -52,7 +47,10 @@ ohos_fuzztest("HandlerInitSinkFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ############################################################################### diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn index 0dda93f8483d4d58bb54d34154ecaea759a35abb..be280231a7f94daba581d8344fd6fdc637d675ef 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("HandlerOnRemoteSinkSvrDiedFuzzTest") { @@ -23,16 +22,12 @@ ohos_fuzztest("HandlerOnRemoteSinkSvrDiedFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", "${common_path}/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] cflags = [ @@ -54,6 +49,7 @@ ohos_fuzztest("HandlerOnRemoteSinkSvrDiedFuzzTest") { external_deps = [ "c_utils:utils", + "ipc:ipc_core", "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn index a5e7b487742f4fded94d087a285ce641f727ef8a..0cf0a8e49d2854096acf1f22c52c9c409ba5282a 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("HandlerSubscribeLocalHardwareFuzzTest") { @@ -23,16 +22,12 @@ ohos_fuzztest("HandlerSubscribeLocalHardwareFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", "${common_path}/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] cflags = [ @@ -52,7 +47,10 @@ ohos_fuzztest("HandlerSubscribeLocalHardwareFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ############################################################################### diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn index 0682eade6720768841b4107011f62e14df523e3e..a17158e853d6b92efaf99b91cf90386d0f91073e 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("HandlerUnsubscribeLocalHardwareFuzzTest") { @@ -23,16 +22,12 @@ ohos_fuzztest("HandlerUnsubscribeLocalHardwareFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", "${common_path}/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] cflags = [ @@ -52,7 +47,10 @@ ohos_fuzztest("HandlerUnsubscribeLocalHardwareFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ############################################################################### diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn index 1e8a6eee09e724561aee2f00f85f5e0f586f1c53..19003b76a65e577f4497c2040a20be5f69134cc1 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ProxyInitSinkFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("ProxyInitSinkFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn index b1df95b97f9a33bcf7f344f9f2bee64fda78b1a3..b5ef11e6ee822e7ac61db475207e56d9e4b8e6b3 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ProxySubscribeLocalHardwareFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("ProxySubscribeLocalHardwareFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn index 5d5e4a5d2d418b4b516e8dc02146c9321ba090ac..f43ee396fa8ecc785b4138381bf95c012c11a627 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ProxyUnsubscribeLocalHardwareFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("ProxyUnsubscribeLocalHardwareFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn index adf6fd4f3fe6c2a57ed0df33c44e2c327186cbf2..00577520698796864636448705b736661439d36a 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("SinkProxyDScreenNotifyFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("SinkProxyDScreenNotifyFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyregresult_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyregresult_fuzzer/BUILD.gn index 52db1b2cd5effdccfdb293bd3434b5eeae882e8f..3c6268a28630ae40bbaf65ab01ded8ef9799ec79 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyregresult_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyregresult_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("CallBackOnNotifyRegResultFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("CallBackOnNotifyRegResultFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyregresult_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyunregresult_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyunregresult_fuzzer/BUILD.gn index 1990660529cc278515f7cdb9cd66952318ad41c1..c5c4e79fe5c4025121a91518ce4066c6c85cbbb5 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyunregresult_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyunregresult_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("CallBackOnNotifyUnregResultFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("CallBackOnNotifyUnregResultFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyunregresult_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonremoterequest_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonremoterequest_fuzzer/BUILD.gn index 7d0dde8c0129e4f3645ebc5e66c443ecb018ef40..28be5860dfec5b65d26166f39a3610429454b175 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonremoterequest_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonremoterequest_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("CallbackOnRemoteRequestFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("CallbackOnRemoteRequestFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonremoterequest_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn index 1bfa68f9bc20f9fa98fd83ca362513eada6d9c27..03bd3af3d70e3a44e082237ab95c80eed8c98363 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("HandlerConfigDistributedHardwareFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("HandlerConfigDistributedHardwareFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", @@ -36,7 +32,6 @@ ohos_fuzztest("HandlerConfigDistributedHardwareFuzzTest") { "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", "${fwk_services_path}/distributedhardwarefwkservice/include", "${fwk_services_path}/distributedhardwarefwkservice/include/componentmanager", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] cflags = [ @@ -59,7 +54,10 @@ ohos_fuzztest("HandlerConfigDistributedHardwareFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ############################################################################### diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn index d18b4fa399b4f0adc8aedd74502afb31a325ee87..953be6a941ed657b9a721ea388ed7685f6508934 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("HandlerInitSourceFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("HandlerInitSourceFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", @@ -36,7 +32,6 @@ ohos_fuzztest("HandlerInitSourceFuzzTest") { "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", "${fwk_services_path}/distributedhardwarefwkservice/include", "${fwk_services_path}/distributedhardwarefwkservice/include/componentmanager", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] cflags = [ @@ -59,7 +54,10 @@ ohos_fuzztest("HandlerInitSourceFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ############################################################################### diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn index 4a3e62d6f8d5c9b0c420112c0f88d9c283320ccf..eabd09be0224bf5872eacf7519e7af0574650b26 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("HandlerOnRemoteSourceSvrDiedFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("HandlerOnRemoteSourceSvrDiedFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", @@ -36,7 +32,6 @@ ohos_fuzztest("HandlerOnRemoteSourceSvrDiedFuzzTest") { "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", "${fwk_services_path}/distributedhardwarefwkservice/include", "${fwk_services_path}/distributedhardwarefwkservice/include/componentmanager", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] cflags = [ @@ -61,6 +56,7 @@ ohos_fuzztest("HandlerOnRemoteSourceSvrDiedFuzzTest") { external_deps = [ "c_utils:utils", + "ipc:ipc_core", "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn index 42c6aa439b504ace583656f55b91237a38ece690..ae9869211ec2d0b478fbc4e668cb529ba7c29914 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("HandlerRegisterDistributedHardwareFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("HandlerRegisterDistributedHardwareFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", @@ -36,7 +32,6 @@ ohos_fuzztest("HandlerRegisterDistributedHardwareFuzzTest") { "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", "${fwk_services_path}/distributedhardwarefwkservice/include", "${fwk_services_path}/distributedhardwarefwkservice/include/componentmanager", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] cflags = [ @@ -59,7 +54,10 @@ ohos_fuzztest("HandlerRegisterDistributedHardwareFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ############################################################################### diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn index 5deee259781f0fe80c07e7385dac1c844e0d7641..cc2cfb214b4e7e4a553435e5fba7bf935be7371d 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("HandlerUnregisterDistributedHardwareFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("HandlerUnregisterDistributedHardwareFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", @@ -36,7 +32,6 @@ ohos_fuzztest("HandlerUnregisterDistributedHardwareFuzzTest") { "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", "${fwk_services_path}/distributedhardwarefwkservice/include", "${fwk_services_path}/distributedhardwarefwkservice/include/componentmanager", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] cflags = [ @@ -59,7 +54,10 @@ ohos_fuzztest("HandlerUnregisterDistributedHardwareFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "ipc:ipc_core", + ] } ############################################################################### diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn index b6b130ad0def114210713ef6e1a7d7ae2d12ea00..ac507b834f9fad19de0634edda13e9bd6c3b18a4 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ProxyConfigDistributedHardwareFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("ProxyConfigDistributedHardwareFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn index bbf50f9c826d42c7e80375618373c2d57387a365..c637565213b5c199ceabdc80394906c4d7d02ec7 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ProxyDScreenNotifyFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("ProxyDScreenNotifyFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn index acd421f9d01c9d4945ded05936a1eeba547b7cc1..a183ce1ffbd05ad2c8478d20f5fe3277760ea948 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ProxyInitSourceFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("ProxyInitSourceFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn index 2a4388f2d44bf120c698b024ded81d8318edbfc4..f351d9fcfb958f8406bcce52c4e4fc265c11443a 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ProxyRegisterDistributedHardwareFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("ProxyRegisterDistributedHardwareFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn index 7b81681bf6e2c86ae06fa26e99d064763825bb57..d39bdd207bbae7cbee8a127bde9695a52ccbdae1 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ProxyUnregisterDistributedHardwareFuzzTest") { @@ -23,10 +22,7 @@ ohos_fuzztest("ProxyUnregisterDistributedHardwareFuzzTest") { fuzz_config_file = "${interfaces_path}/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer" - include_dirs = [ - "//utils/system/safwk/native/include", - "${fwk_common_path}/utils/include", - ] + include_dirs = [ "${fwk_common_path}/utils/include" ] include_dirs += [ "include", diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index efa181b5cfd63a801c3366aca4f3509734d32aa2..b45e0dfcab717ce1062ea3f9ed1951aa0e6b6e91 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../distributedscreen.gni") module_out_path = "distributed_screen/source_trans_test" @@ -35,8 +34,6 @@ config("module_private_config") { "${interfaces_path}/innerkits/native_cpp/screen_sink/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include/callback", "${interfaces_path}/innerkits/native_cpp/test/unittest/screensinktest/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", ] } @@ -56,6 +53,7 @@ ohos_unittest("ScreenSinkTest") { external_deps = [ "c_utils:utils", + "ipc:ipc_core", "samgr:samgr_proxy", ] } diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index 20213111db31ee869df0d82beebcbf9eeeb08a81..3508508633f0e0dea9e387b1ea0ab5040e9215e0 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../distributedscreen.gni") module_out_path = "distributed_screen/source_trans_test" @@ -21,23 +20,21 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include", ] include_dirs += [ "./include", - "${services_path}/screentransport/test/unittest/screentranstestutils/include", "${common_path}/include", - "${services_path}/common/databuffer/include", - "${services_path}/common/screen_channel/include", - "${services_path}/common/utils/include", "${interfaces_path}/innerkits/native_cpp/screen_source/include", "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", "${interfaces_path}/innerkits/native_cpp/test/unittest/screensourcetest/include", "${interfaces_path}/innerkits/native_cpp/test/unittest/screensourcetest/include/callback", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + "${services_path}/common/databuffer/include", + "${services_path}/common/screen_channel/include", + "${services_path}/common/utils/include", + "${services_path}/screentransport/test/unittest/screentranstestutils/include", ] } @@ -54,7 +51,6 @@ ohos_unittest("ScreenSourceTest") { deps = [ "${interfaces_path}/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp index 47c338903dcc97407b91ad938e190e8df0144c7f..3ecf057867c82159d557fcb304925c9be653e1f5 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp @@ -250,6 +250,7 @@ HWTEST_F(DScreenSourceHandlerTest, UnregisterDistributedHardware_004, TestSize.L { const std::string devId = "devId"; const std::string dhId = "dhId"; + DScreenSourceHandler::GetInstance().InitSource("DScreenSourceHandlerTest"); std::shared_ptr callback = std::make_shared(); DScreenSourceHandler::GetInstance().dScreenSourceCallback_ = nullptr; diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index ad0841d22f766a763ca7414e59505e2d6f06fb83..9d0bb2789ab6afed3cf8cd7551b1aee802659041 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -13,33 +13,22 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../distributedscreen.gni") ohos_shared_library("distributed_screen_handler") { include_dirs = [ "//third_party/json/include", - "${windowmanager_path}/interfaces/innerkits/dm", - "${mediastandard_path}/interfaces/inner_api/native", "${fwk_common_path}/utils/include", ] include_dirs += [ "include", "${common_path}/include", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", ] sources = [ "src/dscreen_handler.cpp" ] - deps = [ - "${common_path}:distributed_screen_utils", - "${windowmanager_path}/dm:libdm", - ] + deps = [ "${common_path}:distributed_screen_utils" ] defines = [ "HI_LOG_ENABLE", @@ -49,8 +38,11 @@ ohos_shared_library("distributed_screen_handler") { external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_display_device", + "ipc:ipc_core", "graphic_standard:surface", "multimedia_player_framework:media_client", + "window_manager:libdm", ] subsystem_name = "distributedhardware" diff --git a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn index 8750d3b76aadbc1423f46b0a4c20e4d58091bf7a..3ded9f5ec6b74964db13444001254d1c218b3e76 100644 --- a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("PluginHardwareFuzzTest") { @@ -25,8 +24,6 @@ ohos_fuzztest("PluginHardwareFuzzTest") { include_dirs = [ "//third_party/json/include", - "${windowmanager_path}/interfaces/innerkits/dm", - "${mediastandard_path}/interfaces/innerkits/native/media/include", "${fwk_common_path}/utils/include", ] @@ -35,16 +32,7 @@ ohos_fuzztest("PluginHardwareFuzzTest") { "${common_path}/include", "${distributedscreen_path}/screenhandler/include", "${fwk_services_path}/distributedhardwarefwkservice/include/localhardwaremanager", - "//drivers/peripheral/base", - "//drivers/peripheral/display/interfaces/include", - "//foundation/arkui/ace_engine/frameworks/base/utils", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/distributedhardware/distributed_hardware_fwk/common/utils/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//foundation/window/window_manager/utils/include", + "${fwk_common_path}/utils/include", ] cflags = [ @@ -67,7 +55,14 @@ ohos_fuzztest("PluginHardwareFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "drivers_peripheral_display:hdi_display_gralloc", + "graphic_standard:libgraphic_utils", + "graphic_standard:surface", + "ipc:ipc_core", + "window_manager:libdm", + ] } ############################################################################### diff --git a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn index 8fe81db08f60e356a33c6dc8273fc83e4b195a3e..4887078232e60384997467a450cc3d3850c713c2 100644 --- a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("RegisterPluginListenerFuzzTest") { @@ -25,8 +24,6 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") { include_dirs = [ "//third_party/json/include", - "${windowmanager_path}/interfaces/innerkits/dm", - "${mediastandard_path}/interfaces/innerkits/native/media/include", "${fwk_common_path}/utils/include", ] @@ -35,16 +32,7 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") { "${common_path}/include", "${distributedscreen_path}/screenhandler/include", "${fwk_services_path}/distributedhardwarefwkservice/include/localhardwaremanager", - "//drivers/peripheral/base", - "//drivers/peripheral/display/interfaces/include", - "//foundation/arkui/ace_engine/frameworks/base/utils", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/distributedhardware/distributed_hardware_fwk/common/utils/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//foundation/window/window_manager/utils/include", + "${fwk_common_path}/utils/include", ] cflags = [ @@ -67,7 +55,14 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "drivers_peripheral_display:hdi_display_gralloc", + "graphic_standard:libgraphic_utils", + "graphic_standard:surface", + "ipc:ipc_core", + "window_manager:libdm", + ] } ############################################################################### diff --git a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn index 7382b18727c599bc5772dc47e2b2f5afa42449ea..c62c7ba6e3cc92f4b52a13a0b3741ed4f0e6f2d8 100644 --- a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn @@ -14,8 +14,7 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("UnPluginHardwareFuzzTest") { @@ -25,8 +24,6 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") { include_dirs = [ "//third_party/json/include", - "${windowmanager_path}/interfaces/innerkits/dm", - "${mediastandard_path}/interfaces/innerkits/native/media/include", "${fwk_common_path}/utils/include", ] @@ -35,16 +32,7 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") { "${common_path}/include", "${distributedscreen_path}/screenhandler/include", "${fwk_services_path}/distributedhardwarefwkservice/include/localhardwaremanager", - "//drivers/peripheral/base", - "//drivers/peripheral/display/interfaces/include", - "//foundation/arkui/ace_engine/frameworks/base/utils", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/distributedhardware/distributed_hardware_fwk/common/utils/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//foundation/window/window_manager/utils/include", + "${fwk_common_path}/utils/include", ] cflags = [ @@ -67,7 +55,14 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "drivers_peripheral_display:hdi_display_gralloc", + "graphic_standard:libgraphic_utils", + "graphic_standard:surface", + "ipc:ipc_core", + "window_manager:libdm", + ] } ############################################################################### diff --git a/screenhandler/test/unittest/screenhandler/BUILD.gn b/screenhandler/test/unittest/screenhandler/BUILD.gn index 5b10c785bc0da710c44e7ddca23dc872ddfcffa8..07fd571078335d60b9583ebf3fd9f3c04f22346d 100644 --- a/screenhandler/test/unittest/screenhandler/BUILD.gn +++ b/screenhandler/test/unittest/screenhandler/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../distributedscreen.gni") module_out_path = "distributed_screen/dscreen_handler_test" @@ -21,21 +20,13 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "${windowmanager_path}/interfaces/innerkits/dm", - "${graphicstandard_path}/interfaces/innerkits/surface", - "${mediastandard_path}/interfaces/inner_api/native", "${fwk_common_path}/utils/include", ] include_dirs += [ "./include", "${common_path}/include", - "//foundation/distributedhardware/distributed_screen/screenhandler/include", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", + "${distributedscreen_path}/screenhandler/include", ] } @@ -48,14 +39,20 @@ ohos_unittest("DscreenHandlerTest") { configs = [ ":module_private_config" ] deps = [ - "${windowmanager_path}/dm:libdm", - "//foundation/distributedhardware/distributed_screen/screenhandler:distributed_screen_handler", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + "${distributedscreen_path}/screenhandler:distributed_screen_handler", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "drivers_peripheral_display:hdi_display_device", + "graphic_standard:libgraphic_utils", + "graphic_standard:surface", + "ipc:ipc_core", + "multimedia_player_framework:media_client", + "window_manager:libdm", + ] defines = [ "HI_LOG_ENABLE", diff --git a/services/common/test/unittest/databuffer/BUILD.gn b/services/common/test/unittest/databuffer/BUILD.gn index 9dfd4e9c44d0ec9cd68f8018af85f166708de5cf..11e8f193e3f3ee8bf2765871712b077282b93871 100644 --- a/services/common/test/unittest/databuffer/BUILD.gn +++ b/services/common/test/unittest/databuffer/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../distributedscreen.gni") module_out_path = "distributed_screen/services/data_buffer_test" diff --git a/services/common/test/unittest/decision_center/BUILD.gn b/services/common/test/unittest/decision_center/BUILD.gn index eda3080b77264835ef5c5291a92ccb0d1283673c..34420a53b7c4e9caf8cf3f1e4967291cdb7fd4e9 100644 --- a/services/common/test/unittest/decision_center/BUILD.gn +++ b/services/common/test/unittest/decision_center/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../distributedscreen.gni") module_out_path = "distributed_screen/services/screen_decision_center_test" diff --git a/services/common/test/unittest/imageJpeg/BUILD.gn b/services/common/test/unittest/imageJpeg/BUILD.gn index 417517d76e5d0ccee4b82f9c63901775975ef841..2c3f12cad65fec48e8dacd345de54355f497a887 100644 --- a/services/common/test/unittest/imageJpeg/BUILD.gn +++ b/services/common/test/unittest/imageJpeg/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../distributedscreen.gni") module_out_path = "distributed_screen/services/jpeg_image_processor_test" diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index 73c301ee087347cf777214244d535d8d569fbee0..7445368206e57e344958e689cc316bb198d8f341 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../distributedscreen.gni") module_out_path = "distributed_screen/services/utils_test" @@ -25,7 +24,7 @@ config("module_private_config") { "${fwk_common_path}/utils/include", "${fwk_common_path}/log/include", "${fwk_utils_path}/include/log", - "//foundation/distributedhardware/distributed_hardware_fwk/interfaces/inner_kits/include", + "${fwk_interfaces_path}/inner_kits/include", ] include_dirs += [ @@ -49,11 +48,12 @@ ohos_unittest("UtilsTest") { configs = [ ":module_private_config" ] deps = [ - "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", + "${fwk_interfaces_path}/inner_kits:libdhfwk_sdk", "${services_path}/screenservice/sinkservice:distributed_screen_sink", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + } group("utils_test") { diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 1e92ec4f43e6ed9c428ff6a40b368aec0496eaf5..a1c3515fe7f2ffa68346445691274825ccecc7ed 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -13,16 +13,12 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../distributedscreen.gni") ohos_shared_library("distributed_screen_client") { include_dirs = [ "${windowmanager_path}/interfaces/innerkits/wm", - "${graphicstandard_path}/interfaces/inner_api/surface", - "${graphicstandard_path}/rosen/modules/render_service_client/core/ui", "${fwk_common_path}/utils/include", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include/", ] include_dirs += [ @@ -37,8 +33,7 @@ ohos_shared_library("distributed_screen_client") { deps = [ "${common_path}:distributed_screen_utils", - "${windowmanager_path}/wm:libwm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", ] defines = [ @@ -49,7 +44,9 @@ ohos_shared_library("distributed_screen_client") { external_deps = [ "graphic_standard:libgraphic_utils", + "graphic_standard:surface", "input:libmmi-client", + "window_manager:libwm", ] part_name = "distributed_screen" diff --git a/services/screenclient/src/screen_client_window_adapter.cpp b/services/screenclient/src/screen_client_window_adapter.cpp index c03ad6776486fa6e2e062b1fbb9df28e11a3726b..9759abec8b862408b5841ce717403d457194cf66 100644 --- a/services/screenclient/src/screen_client_window_adapter.cpp +++ b/services/screenclient/src/screen_client_window_adapter.cpp @@ -15,7 +15,6 @@ #include "screen_client_window_adapter.h" -#include "rs_surface_node.h" #include "transaction/rs_interfaces.h" #include "window_option.h" #include "wm_common.h" diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 909f4248e251f0a0f83ed1ff4c32b2af7d14481a..2f8a414f02f0fbb22fd6502a1ef12d07a855a1e3 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../distributedscreen.gni") module_out_path = "distributed_screen/screen_client_test" @@ -54,7 +53,10 @@ ohos_unittest("ScreenClientTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "input:libmmi-client" ] + external_deps = [ + "input:libmmi-client", + "window_manager:libwm", + ] } group("screen_client_test") { diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index 21f747960ef0d71458d996d235320b81b473e9cd..31752ec2de05b37af6fdd8ad71800d3e9d32e804 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../distributedscreen.gni") ohos_executable("distributedScreenTest") { install_enable = false @@ -24,17 +23,10 @@ ohos_executable("distributedScreenTest") { "${interfaces_path}/innerkits/native_cpp/screen_source/include", "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", "${fwk_common_path}/utils/include", - "${windowmanager_path}/interfaces/innerkits/dm", "${services_path}/screenclient/include", - "${windowmanager_path}/interfaces/innerkits/wm", "${common_path}/include", - "//base/security/access_token/interfaces/innerkits/nativetoken/include/", - "//base/security/access_token/interfaces/innerkits/token_setproc/include/", ] - include_dirs += - [ "foundation/multimedia/player_framework/interfaces/inner_api/native" ] - sources = [ "./decoder_demo.cpp", "./test.cpp", @@ -45,14 +37,7 @@ ohos_executable("distributedScreenTest") { "${interfaces_path}/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", "${interfaces_path}/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", "${services_path}/screenclient:distributed_screen_client", - "${windowmanager_path}/dm:libdm", - "${windowmanager_path}/wm:libwm", - "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", - "//foundation/communication/dsoftbus/adapter:softbus_adapter", - "//foundation/communication/dsoftbus/sdk:softbus_client", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", ] defines = [ @@ -63,8 +48,15 @@ ohos_executable("distributedScreenTest") { external_deps = [ "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", + "dsoftbus:softbus_client", + "graphic_standard:surface", "hiviewdfx_hilog_native:libhilog", "multimedia_player_framework:media_client", + "samgr:samgr_proxy", + "window_manager:libdm", + "window_manager:libwm", ] cflags = [ "-Wall" ] diff --git a/services/screendemo/decoder_demo.cpp b/services/screendemo/decoder_demo.cpp index c90351a2a105f6f0bf56f2495af3ad0724231a8f..580ffe1b77863fe808c7c6f45d2b459fd9472858 100644 --- a/services/screendemo/decoder_demo.cpp +++ b/services/screendemo/decoder_demo.cpp @@ -20,7 +20,6 @@ #include "avcodec_list.h" #include "securec.h" -#include "ui/rs_surface_node.h" #include "wm_common.h" #include "window.h" #include "window_option.h" diff --git a/services/screendemo/test.cpp b/services/screendemo/test.cpp index 4430e7043e75db4d460178f7beb8b76d832fcb9b..fb981a0421d9bb858fe11c0c99fc3e7945c9a1e9 100644 --- a/services/screendemo/test.cpp +++ b/services/screendemo/test.cpp @@ -34,7 +34,6 @@ #include "token_setproc.h" #include "decoder_demo.h" -#include "softbus_adapter_mem.h" #include "softbus_bus_center.h" #include "softbus_common.h" diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index d75c40184f4ab7ccb5c959a2ffb812c62e580ec2..a5bfd833240027364fc0cd94bedaabda3e4542a0 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -13,19 +13,11 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../distributedscreen.gni") ohos_shared_library("distributed_screen_sink") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", "//third_party/json/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "${windowmanager_path}/interfaces/innerkits/dm", "${fwk_common_path}/utils/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", ] @@ -45,9 +37,6 @@ ohos_shared_library("distributed_screen_sink") { "${services_path}/screentransport/screensinkprocessor/include", "${services_path}/screentransport/screensinkprocessor/decoder/include", "${services_path}/screenclient/include/", - "//foundation/multimedia/image_framework/interfaces/innerkits/include", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", ] sources = [ @@ -67,7 +56,6 @@ ohos_shared_library("distributed_screen_sink") { "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", "${services_path}/screenclient:distributed_screen_client", "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", - "${windowmanager_path}/dm:libdm", ] defines = [ @@ -78,9 +66,15 @@ ohos_shared_library("distributed_screen_sink") { external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_display_gralloc", + "graphic_standard:libgraphic_utils", + "graphic_standard:surface", + "hisysevent_native:libhisysevent", "ipc:ipc_core", + "multimedia_image_framework:image_native", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", ] subsystem_name = "distributedhardware" diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index a274fd44918fed9f53b15fe0f4d318124fd2f2d5..ebc557e600777f7f88d9da48682de4f764b51bd6 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -13,20 +13,14 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../distributedscreen.gni") ohos_shared_library("distributed_screen_source") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", - "//commonlibrary/c_utils/base/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", "//third_party/json/include", "//third_party/libjpeg-turbo", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", - "${windowmanager_path}/interfaces/innerkits/dm", "${fwk_common_path}/utils/include", - "${mediastandard_path}/interfaces/inner_api/native", ] include_dirs += [ @@ -65,9 +59,7 @@ ohos_shared_library("distributed_screen_source") { deps = [ "${common_path}:distributed_screen_utils", "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", - "${mediastandard_path}/interfaces/inner_api/native:media_client", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "${windowmanager_path}/dm:libdm", ] defines = [ @@ -80,11 +72,13 @@ ohos_shared_library("distributed_screen_source") { "c_utils:utils", "graphic_standard:libcomposer", "graphic_standard:surface", + "hisysevent_native:libhisysevent", "ipc:ipc_core", "multimedia_image_framework:image_native", "multimedia_player_framework:media_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", ] subsystem_name = "distributedhardware" diff --git a/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn b/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn index f36a1e6541abe6a8ae9111fdc9969e79e9907564..044530d53a42b304368cc15370e8ad95c2d75138 100644 --- a/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../distributedscreen.gni") module_out_path = "distributed_screen/dscreen_sink_service_test" diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 58b72f968248ad2b14469dcbaf9c9e5b83930f6a..96f2b0f2c346c255981ea40c556e45677bcabc47 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -12,22 +12,14 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../distributedscreen.gni") module_out_path = "distributed_screen/dscreen_sink_service_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", "//third_party/json/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "${windowmanager_path}/interfaces/innerkits/dm", "${fwk_common_path}/utils/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", ] @@ -47,9 +39,6 @@ config("module_private_config") { "${services_path}/screentransport/screensinkprocessor/decoder/include", "${services_path}/screenclient/include/", "${services_path}/screenservice/sinkservice/screenregionmgr/include", - "//foundation/multimedia/image_framework/interfaces/innerkits/include", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", ] } @@ -71,5 +60,13 @@ ohos_unittest("DscreenRegionMgrTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "drivers_peripheral_display:hdi_display_gralloc", + "hisysevent_native:libhisysevent", + "graphic_standard:libgraphic_utils", + "graphic_standard:surface", + "multimedia_image_framework:image_native", + "window_manager:libdm", + ] } diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 01b53dc593e3738bb3951998174770651a67b081..fd9802897b9eca27d67d34c65131f45ff28f17f5 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -12,24 +12,19 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../distributedscreen.gni") module_out_path = "distributed_screen/DscreenMgrTest" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${windowmanager_path}/interfaces/innerkits/dm", "//third_party/json/include", "${graphicstandard_path}/interfaces/inner_api/surface", "${graphicstandard_path}/interfaces/inner_api/common", - "//drivers/peripheral/display/interfaces/include", "${graphicstandard_path}/utils/buffer_handle/export", - "//foundation/window/window_manager/utils/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", "${distributedhardwarefwk_path}/common/utils/include", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include/", "${mediastandard_path}/interfaces/inner_api/native", ] @@ -66,17 +61,18 @@ ohos_unittest("DscreenMgrTest") { deps = [ "${distributedscreen_path}/common:distributed_screen_utils", - "${mediastandard_path}/interfaces/inner_api/native:media_client", "${services_path}/screenservice/sourceservice:distributed_screen_source", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "${windowmanager_path}/dm:libdm", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_standard:sync_fence", "hdf_core:libhdi", + "multimedia_player_framework:media_client", + "window_manager:libdm", ] } diff --git a/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn index 384ef3bdefa297c16a1f43cabb1643bc9dda579b..14d5f4d396f25f05d718c30a669f7c276cfba561 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../../distributedscreen.gni") module_out_path = "distributed_screen/dscreen_source_service_test" diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 15dc171b491707d45491bbaa340a7840dc06628d..e1f1ce08b192c4d6e595017ff8bccda3776a4cc0 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -13,18 +13,14 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../distributedscreen.gni") ohos_shared_library("distributed_screen_sinktrans") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", "//third_party/json/include", "//third_party/libjpeg", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/inner_kits/include", - "${ipc_interfaces_path}/innerkits/ipc_core/include", "${services_path}/common/utils/include", ] @@ -60,7 +56,6 @@ ohos_shared_library("distributed_screen_sinktrans") { deps = [ "${common_path}:distributed_screen_utils", "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", - "//foundation/graphic/graphic_2d/frameworks/surface:surface", "//third_party/libjpeg-turbo:turbojpeg_static", ] @@ -79,6 +74,7 @@ ohos_shared_library("distributed_screen_sinktrans") { external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "graphic_standard:surface", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index f1c13ade55a169f2ce59fe0ee21bfc4b6314cb66..1c4d3e0b719f5cdb5cf804dc6dd24a90c48e2dea 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -13,17 +13,13 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") - +import("../../../distributedscreen.gni") ohos_shared_library("distributed_screen_sourcetrans") { include_dirs = [ - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", "//third_party/json/include", "//third_party/libjpeg-turbo", "${fwk_common_path}/utils/include", "${fwk_interfaces_path}/inner_kits/include", - "${ipc_interfaces_path}/innerkits/ipc_core/include", "${services_path}/common/utils/include", ] @@ -57,8 +53,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { deps = [ "${common_path}:distributed_screen_utils", - "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", - "//foundation/graphic/graphic_2d/frameworks/surface:surface", + "${fwk_interfaces_path}/inner_kits:libdhfwk_sdk", "//third_party/libjpeg-turbo:turbojpeg_static", ] @@ -77,6 +72,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "graphic_standard:surface", "graphic_standard:sync_fence", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn index ca1e1aa7c085871ddc20f6c7236461c6a57a9562..8644f9778787ee9ace0f7a4cd8817cf3dd36f7b5 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../distributedscreen.gni") module_out_path = "distributed_screen/data_channel_test" @@ -38,9 +37,6 @@ config("module_private_config") { "${services_path}/screentransport/screensourceprocessor/include", "${services_path}/screentransport/screensourceprocessor/encoder/include", "${services_path}/softbusadapter/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/transport", ] } @@ -58,7 +54,10 @@ ohos_unittest("DataChannelTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "dsoftbus:softbus_client", + ] defines = [ "HI_LOG_ENABLE", diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index ea9e29592a550f7a5b5248bca20604e52982fc3a..7db812517de7879d7948d0914ea7fe0cf97dacfa 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -14,8 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../distributedscreen.gni") module_out_path = "distributed_screen/sink_processor_test" @@ -57,13 +56,13 @@ ohos_unittest("SinkProcessorTest") { deps = [ "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", - "//foundation/graphic/graphic_2d/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", + "graphic_standard:surface", "multimedia_player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 2725a6212d4e98d58a8a327a9ceda2b7911e562e..e9357f929929bd7554e90f18ad0cff61c18581eb 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -14,8 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../distributedscreen.gni") module_out_path = "distributed_screen/sink_trans_test" @@ -41,9 +40,6 @@ config("module_private_config") { "${services_path}/screentransport/screensourceprocessor/include", "${services_path}/screentransport/screensourcetrans/include", "${services_path}/screentransport/test/unittest/screentranstestutils/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//drivers/peripheral/base", ] } @@ -57,13 +53,14 @@ ohos_unittest("SinkTransTest") { deps = [ "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", - "//foundation/graphic/graphic_2d/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", + "graphic_standard:surface", "multimedia_player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index ffc296a20d2f0eecb3e31f522371b83a6939f553..78066a56aae463005e18f32c7fc062c663b26b0f 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../distributedscreen.gni") module_out_path = "distributed_screen/source_processor_test" @@ -39,10 +38,6 @@ config("module_private_config") { "${services_path}/screentransport/screensourceprocessor/encoder/include", "${services_path}/softbusadapter/include", "${services_path}/screentransport/test/unittest/screensourceprocessor/include", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", ] } @@ -65,8 +60,10 @@ ohos_unittest("SourceProcessorTest") { external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_standard:surface", "graphic_standard:sync_fence", + "ipc:ipc_core", "multimedia_player_framework:media_client", ] } diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index ec457af5b6dcf764f311305c2fc2e4794dabfd3c..876d5249ad67582b5d40d9413bd37411a9b171d9 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../distributedscreen.gni") module_out_path = "distributed_screen/source_trans_test" @@ -44,11 +43,6 @@ config("module_private_config") { "${services_path}/screentransport/test/unittest/screensourcetrans/include", "${services_path}/screentransport/test/unittest/screentranstestutils/include", "${services_path}/softbusadapter/include", - "//drivers/peripheral/base", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", ] } @@ -68,8 +62,10 @@ ohos_unittest("SourceTransTest") { external_deps = [ "c_utils:utils", + "graphic_standard:libgraphic_utils", "graphic_standard:surface", "graphic_standard:sync_fence", + "ipc:ipc_core", "multimedia_player_framework:media_client", ] } diff --git a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn index 76e4d2abbc8e1472728dff1677988e02408d2573..fd0b6fc8be51dbb7c3b4e771350f43b6a23cfc36 100644 --- a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn +++ b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../../distributedscreen.gni") module_out_path = "distributed_screen/screen_callback_test" @@ -45,13 +44,6 @@ config("module_private_config") { "${services_path}/screentransport/screensourceprocessor/encoder/include", "${services_path}/screentransport/test/unittest/screensourcetrans/include", "${services_path}/softbusadapter/include", - "//drivers/peripheral/display/interfaces/include", - "//drivers/peripheral/base", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", - "//foundation/graphic/graphic_2d/interfaces/inner_api/common", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//foundation/multimedia/player_framework/interfaces/inner_api/native", ] } @@ -72,7 +64,11 @@ ohos_unittest("ScreenCallbackTest") { external_deps = [ "c_utils:utils", + "drivers_peripheral_display:hdi_display_gralloc", + "graphic_standard:libgraphic_utils", + "graphic_standard:surface", "graphic_standard:sync_fence", + "ipc:ipc_core", "multimedia_player_framework:media_client", ] } diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index c8b091dd48a3b66c41598cd222e8b8d50fe6278d..9226659af73eaae8f3a464cd7417d5f681c7bd50 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -12,8 +12,7 @@ # limitations under the License. import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") +import("../../../../distributedscreen.gni") module_out_path = "distributed_screen/soft_bus_adapter_test" @@ -37,9 +36,6 @@ config("module_private_config") { "${services_path}/screentransport/screensourceprocessor/include", "${services_path}/screentransport/screensourceprocessor/encoder/include", "${services_path}/softbusadapter/include", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/transport", ] }