From c74dac74a6f56f2b385ddf0452128529cba5c461 Mon Sep 17 00:00:00 2001 From: yangli Date: Mon, 24 Apr 2023 17:59:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?gn=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/BUILD.gn | 8 +++--- common/test/unittest/BUILD.gn | 5 +--- .../innerkits/native_cpp/screen_sink/BUILD.gn | 9 ++----- .../native_cpp/screen_source/BUILD.gn | 9 ++----- .../handlerinitsink_fuzzer/BUILD.gn | 14 +++++----- .../BUILD.gn | 10 +++---- .../BUILD.gn | 14 +++++----- .../BUILD.gn | 14 +++++----- .../proxyinitsink_fuzzer/BUILD.gn | 8 ++---- .../BUILD.gn | 8 ++---- .../BUILD.gn | 8 ++---- .../sinkproxydscreennotify_fuzzer/BUILD.gn | 8 ++---- .../callbackonnotifyregresult_fuzzer/BUILD.gn | 8 ++---- .../BUILD.gn | 8 ++---- .../callbackonremoterequest_fuzzer/BUILD.gn | 8 ++---- .../BUILD.gn | 14 +++++----- .../handlerinitsource_fuzzer/BUILD.gn | 14 +++++----- .../BUILD.gn | 10 +++---- .../BUILD.gn | 14 +++++----- .../BUILD.gn | 14 +++++----- .../BUILD.gn | 8 ++---- .../proxydscreennotify_fuzzer/BUILD.gn | 8 ++---- .../proxyinitsource_fuzzer/BUILD.gn | 8 ++---- .../BUILD.gn | 8 ++---- .../BUILD.gn | 8 ++---- .../test/unittest/screensinktest/BUILD.gn | 6 ++--- .../test/unittest/screensourcetest/BUILD.gn | 14 ++++------ .../src/dscreen_source_handler_test.cpp | 1 + screenhandler/BUILD.gn | 18 ++++--------- .../fuzztest/pluginhardware_fuzzer/BUILD.gn | 25 +++++++---------- .../registerpluginlistener_fuzzer/BUILD.gn | 25 +++++++---------- .../fuzztest/unpluginhardware_fuzzer/BUILD.gn | 25 +++++++---------- .../test/unittest/screenhandler/BUILD.gn | 27 +++++++++---------- .../common/test/unittest/databuffer/BUILD.gn | 3 +-- .../test/unittest/decision_center/BUILD.gn | 3 +-- .../common/test/unittest/imageJpeg/BUILD.gn | 3 +-- services/common/test/unittest/utils/BUILD.gn | 8 +++--- services/screenclient/BUILD.gn | 11 +++----- .../src/screen_client_window_adapter.cpp | 1 - services/screenclient/test/unittest/BUILD.gn | 8 +++--- services/screendemo/BUILD.gn | 26 +++++++----------- services/screendemo/decoder_demo.cpp | 1 - services/screendemo/test.cpp | 1 - services/screenservice/sinkservice/BUILD.gn | 20 +++++--------- services/screenservice/sourceservice/BUILD.gn | 12 +++------ .../sinkservice/dscreenservice/BUILD.gn | 3 +-- .../sinkservice/screenregionmgr/BUILD.gn | 23 +++++++--------- .../sourceservice/dscreenmgr/BUILD.gn | 12 +++------ .../sourceservice/dscreenservice/BUILD.gn | 3 +-- .../screentransport/screensinktrans/BUILD.gn | 8 ++---- .../screensourcetrans/BUILD.gn | 10 +++---- .../test/unittest/screendatachannel/BUILD.gn | 11 ++++---- .../unittest/screensinkprocessor/BUILD.gn | 5 ++-- .../test/unittest/screensinktrans/BUILD.gn | 9 +++---- .../unittest/screensourceprocessor/BUILD.gn | 9 +++---- .../test/unittest/screensourcetrans/BUILD.gn | 10 +++---- .../unittest/screentranstestutils/BUILD.gn | 14 ++++------ .../softbusadapter/test/unittest/BUILD.gn | 6 +---- 58 files changed, 213 insertions(+), 393 deletions(-) diff --git a/common/BUILD.gn b/common/BUILD.gn index 65d39eed..74a11957 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 033dd19f..6619c933 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/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn index 2f2ddd29..11b78173 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 bf427380..d77689b1 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 52d2f871..079aecfc 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 0dda93f8..be280231 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 a5e7b487..0cf0a8e4 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 0682eade..a17158e8 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 1e8a6eee..19003b76 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 b1df95b9..b5ef11e6 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 5d5e4a5d..f43ee396 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 adf6fd4f..00577520 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 52db1b2c..3c6268a2 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 19906605..c5c4e79f 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 7d0dde8c..28be5860 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 1bfa68f9..03bd3af3 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 d18b4fa3..953be6a9 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 4a3e62d6..eabd09be 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 42c6aa43..ae986921 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 5deee259..cc2cfb21 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 b6b130ad..ac507b83 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 bbf50f9c..c6375652 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 acd421f9..a183ce1f 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 2a4388f2..f351d9fc 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 7b81681b..d39bdd20 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 efa181b5..b45e0dfc 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 20213111..35085086 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 47c33890..3ecf0578 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 ad0841d2..9d0bb278 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 8750d3b7..3ded9f5e 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 8fe81db0..48870782 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 7382b187..c62c7ba6 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 5b10c785..07fd5710 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 9dfd4e9c..11e8f193 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 eda3080b..34420a53 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 417517d7..2c3f12ca 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 73c301ee..74453682 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 1e92ec4f..a1c3515f 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 c03ad677..9759abec 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 909f4248..2f8a414f 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 21f74796..31752ec2 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 c90351a2..580ffe1b 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 4430e704..fb981a04 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 d75c4018..a5bfd833 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 a274fd44..ebc557e6 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 f36a1e65..044530d5 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 58b72f96..96f2b0f2 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 01b53dc5..fd980289 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 384ef3bd..14d5f4d3 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 15dc171b..e1f1ce08 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 f1c13ade..1c4d3e0b 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 ca1e1aa7..8644f977 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 ea9e2959..7db81251 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 2725a621..e9357f92 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 ffc296a2..78066a56 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 ec457af5..876d5249 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 76e4d2ab..fd0b6fc8 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 c8b091dd..9226659a 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", ] } -- Gitee From e045b9636484c1643468a37efe12ca0591be8c95 Mon Sep 17 00:00:00 2001 From: yangli Date: Mon, 24 Apr 2023 19:24:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?gn=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangli --- distributedscreen.gni | 1 - 1 file changed, 1 deletion(-) diff --git a/distributedscreen.gni b/distributedscreen.gni index e02cbb0f..5049c406 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" -- Gitee