diff --git a/bundle.json b/bundle.json index c504f53c5a35f83662d6e5036251669a67bec851..d944c116c1ad995aaf71b43ce85fe15f8f440251 100644 --- a/bundle.json +++ b/bundle.json @@ -1,7 +1,7 @@ { "name":"@ohos/distributed_screen", "description":"distributed hardware screen", - "version":"3.1", + "version":"4.0", "author":{}, "repository":"https://gitee.com/openharmony/distributed_screen", "license":"Apache License 2.0", @@ -21,8 +21,8 @@ "adapted_system_type":[ "standard" ], - "rom":"2000k", - "ram":"6M", + "rom":"2000KB", + "ram":"6MB", "hisysevent_config": [ "//foundation/distributedhardware/distributed_screen/hisysevent.yaml" ], diff --git a/common/BUILD.gn b/common/BUILD.gn index 65d39eed4de69b7da42a31fc419b60c5918e9e21..75ec9a9dcd39b2d6992331503e2bf9c2208888c0 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -19,9 +19,6 @@ import( 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 +35,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..7192a3f8d700d8aead805d1a5036499b8a96d5dd 100644 --- a/common/test/unittest/BUILD.gn +++ b/common/test/unittest/BUILD.gn @@ -21,9 +21,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", ] } @@ -41,11 +39,13 @@ ohos_unittest("ScreenCommonTest") { configs = [ ":module_private_config" ] deps = [ "${common_path}:distributed_screen_utils" ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"dscreencommontest\"", "LOG_DOMAIN=0xD004100", ] + external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", diff --git a/distributedscreen.gni b/distributedscreen.gni index e02cbb0fdf29c05bbbd6896f73455f649c0763ee..f638a683fd08f8622232e086dd76f32ad93aa9b5 100644 --- a/distributedscreen.gni +++ b/distributedscreen.gni @@ -16,6 +16,7 @@ distributedhardwarefwk_path = "//foundation/distributedhardware/distributed_hardware_fwk" windowmanager_path = "//foundation/window/window_manager" mediastandard_path = "//foundation/multimedia/player_framework" +driver_path = "//drivers/peripheral/display" 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..f964e9903ae07397106152004e5aa2256277ed43 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn @@ -17,11 +17,7 @@ import( "//foundation/distributedhardware/distributed_screen/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..6c0f43c3c8e48c601183ee36ffbda66700f552bc 100644 --- a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn @@ -17,11 +17,7 @@ import( "//foundation/distributedhardware/distributed_screen/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..9df4d5b205943308d1c49c19a6d7a7277ebe36f1 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 @@ -23,16 +23,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 +48,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..673215b7f723a204d0f226f195cd75e4b5a4ab79 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 @@ -23,16 +23,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 +50,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..e1ef8a4afdae5fea769d107aa1847865a06340b8 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 @@ -23,16 +23,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 +48,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..5e5a1cb23abd14b58846cfecf6873cc7703234b7 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 @@ -23,16 +23,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 +48,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..a69dde21ac13e110b6b1f9ebfabe1c7501c1891a 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 @@ -23,10 +23,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..2d13d9da80ffad0d49409770983d84925d75a334 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 @@ -23,10 +23,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..dc839c72b0273807fad3a76e7519f6b029228b01 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 @@ -23,10 +23,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..8f07057de978beed5bac3bfee8e78feb92abca15 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 @@ -23,10 +23,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..333d5eee5fe548ff7d74f5775b5a93512a17a520 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 @@ -23,10 +23,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..dea6b1c50525fe483db38652491169a57ed9ce18 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 @@ -23,10 +23,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..35fa1bef4a08c65839b6c1b25c6d33b11b74b8ba 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 @@ -23,10 +23,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..03df4ebee30ad17a210476e38c3ed0e7cb154258 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 @@ -23,10 +23,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 +33,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 +55,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..a6c4613a9ae70a3903e8858e47e391a1d13e1052 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 @@ -23,10 +23,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 +33,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 +55,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..46e576d93c043a0b427a2dd7fb779ee04ddf9667 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 @@ -23,10 +23,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 +33,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 +57,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..520e7eef6140fee33492721d9b403c7e6a3e3b75 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 @@ -23,10 +23,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 +33,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 +55,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..5a4f742033756d66a9d1c3298fdd08ea4a537a32 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 @@ -23,10 +23,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 +33,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 +55,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..5ee409bd4ffc8c9589e1ec19467c2fc886b1541b 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 @@ -23,10 +23,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..7fece3e3e2c4225eb1258f82356600a28594ff28 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 @@ -23,10 +23,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..fc00e2acd92a965428488ea6d4ade4d24d12a7ea 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 @@ -23,10 +23,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..01554dbca18d3c843fe63cc3f98ac66f847630e4 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 @@ -23,10 +23,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..dcb44748a41f00d4a241586148ada48c35a7107d 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 @@ -23,10 +23,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..2e7d9b542041cd9d00395949fac49a4758cac671 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -35,8 +35,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 +54,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..fa5ca63676ad7fc7ab73de33d063d66d1b739cb9 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -21,23 +21,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 +52,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..e9638c1aae4cd351267654ae5998eeef42e81777 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -19,27 +19,17 @@ import( 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", @@ -50,7 +40,9 @@ ohos_shared_library("distributed_screen_handler") { external_deps = [ "c_utils:utils", "graphic_standard:surface", + "ipc:ipc_core", "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..21495a14ec709f1ac31e40f2ff335e62824c8c5f 100644 --- a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn @@ -25,8 +25,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 +33,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 +56,13 @@ ohos_fuzztest("PluginHardwareFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "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..4f231d39f944370a265b2372036221a86f97cd3e 100644 --- a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn @@ -25,8 +25,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,23 +33,14 @@ 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 = [ + "-fno-omit-frame-pointer", "-g", "-O0", "-Wno-unused-variable", - "-fno-omit-frame-pointer", ] sources = [ "registerpluginlistener_fuzzer.cpp" ] @@ -67,7 +56,13 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "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..b3673884b14313c235889a3a75a6658a892c4d06 100644 --- a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn @@ -25,8 +25,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 +33,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 +56,13 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "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..ed07925f6c3dde676ac7e4da819513c95a2d63fd 100644 --- a/screenhandler/test/unittest/screenhandler/BUILD.gn +++ b/screenhandler/test/unittest/screenhandler/BUILD.gn @@ -21,21 +21,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 +40,19 @@ 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", + "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/imageJpeg/src/jpeg_image_processor.cpp b/services/common/imageJpeg/src/jpeg_image_processor.cpp index 04cd939904853660a16c1db2239f75be4130ce0d..b5d17eec5f9ba40fd50dedf35790fc9c9196fb77 100644 --- a/services/common/imageJpeg/src/jpeg_image_processor.cpp +++ b/services/common/imageJpeg/src/jpeg_image_processor.cpp @@ -192,7 +192,7 @@ int32_t JpegImageProcessor::ReplaceDamage2LastFrame(uint8_t *lastFrame, uint8_t uint8_t *yTempData = nullptr; uint8_t *uTempData = nullptr; for (int32_t i = 0 ; i < rect.height ; i++) { - yTempData = yData + static_cast(i * configParam_.GetScreenWidth()); + yTempData = yData + static_cast(i) * configParam_.GetScreenWidth(); int32_t ret = memcpy_s(yTempData, rect.width, yDirtyData, rect.width); if (ret != EOK) { DHLOGE("%s: memcpy yData failed.", LOG_TAG); @@ -200,7 +200,7 @@ int32_t JpegImageProcessor::ReplaceDamage2LastFrame(uint8_t *lastFrame, uint8_t } yDirtyData += static_cast(rect.width); if (i % TWO) { - uTempData = uData + static_cast(configParam_.GetScreenWidth() * (i / TWO)); + uTempData = uData + configParam_.GetScreenWidth() * (static_cast(i) / TWO); ret = memcpy_s(uTempData, rect.width, uDirtyData, rect.width); if (ret != EOK) { DHLOGE("%s: memcpy uData failed.", LOG_TAG); @@ -273,7 +273,7 @@ void JpegImageProcessor::DecompressJpegToNV12(size_t jpegSize, uint8_t *inputDat jpeg_mem_src(&cinfo, inputData, jpegSize); (void)jpeg_read_header(&cinfo, TRUE); (void)jpeg_start_decompress(&cinfo); - int32_t row_stride = static_cast(cinfo.output_width * cinfo.output_components); + int32_t row_stride = static_cast(cinfo.output_width) * cinfo.output_components; JSAMPARRAY buffer = (*cinfo.mem->alloc_sarray)((j_common_ptr)&cinfo, JPOOL_IMAGE, row_stride, 1); uint32_t uvIndex = cinfo.output_width * cinfo.output_height; int32_t i = 0; diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index 73c301ee087347cf777214244d535d8d569fbee0..09998e2813e5f3d62c8286ff8315a5ce7d17541a 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -25,7 +25,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,7 +49,7 @@ 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", diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 1e92ec4f43e6ed9c428ff6a40b368aec0496eaf5..bc3234d211c51c54f9c9bdcd47febd10826f5852 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -19,10 +19,7 @@ import( 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 +34,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 +45,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..00ebde072dad8795964b59d93a5575e50578f432 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -54,7 +54,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..61a37e90c46459754112d2c8da0642484492933c 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -24,17 +24,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", @@ -42,17 +35,10 @@ ohos_executable("distributedScreenTest") { deps = [ "${common_path}:distributed_screen_utils", + "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", "${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", ] defines = [ @@ -63,8 +49,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..5f03a55ff61dfbcb9f65d085dc3809cb5736427f 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -18,14 +18,7 @@ import( 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 +38,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 +57,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 +67,14 @@ ohos_shared_library("distributed_screen_sink") { external_deps = [ "c_utils:utils", + "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..a87c8dc716799d34f998be19913bc47b7e58989a 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -18,15 +18,10 @@ import( 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 +60,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 +73,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/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 58b72f968248ad2b14469dcbaf9c9e5b83930f6a..a3dc96b4003738e909748b0f276c13a87f01b052 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -20,14 +20,7 @@ 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 +40,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 +61,12 @@ ohos_unittest("DscreenRegionMgrTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "graphic_standard:libgraphic_utils", + "graphic_standard:surface", + "hisysevent_native:libhisysevent", + "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..224ac8c97ac05ffafa33150556aab42c1bc86c12 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -20,35 +20,32 @@ module_out_path = "distributed_screen/DscreenMgrTest" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${windowmanager_path}/interfaces/innerkits/dm", "//third_party/json/include", + "${driver_path}/interfaces/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", ] include_dirs += [ "./include", - "${services_path}/common/decision_center/include", - "${services_path}/screenservice/sourceservice/dscreenmgr/include", - "${services_path}/common/utils/include", - "${services_path}/common/databuffer/include", - "${services_path}/common/screen_channel/include", "${common_path}/include", - "${services_path}/screentransport/screensourcetrans/include", - "${services_path}/screentransport/screensourceprocessor/include", "${distributedscreen_path}/interfaces/innerkits/native_cpp/screen_sink/include", "${distributedscreen_path}/interfaces/innerkits/native_cpp/screen_sink/include/callback", "${distributedscreen_path}/interfaces/innerkits/native_cpp/screen_source/include", "${distributedscreen_path}/interfaces/innerkits/native_cpp/screen_source/include/callback", + "${services_path}/common/databuffer/include", + "${services_path}/common/decision_center/include", "${services_path}/common/imageJpeg/include", + "${services_path}/common/screen_channel/include", + "${services_path}/common/utils/include", + "${services_path}/screenservice/sourceservice/dscreenmgr/include", "${services_path}/screentransport/screensourceprocessor/encoder/include", + "${services_path}/screentransport/screensourceprocessor/include", + "${services_path}/screentransport/screensourcetrans/include", ] } @@ -66,10 +63,8 @@ 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", ] @@ -78,5 +73,7 @@ ohos_unittest("DscreenMgrTest") { "c_utils:utils", "graphic_standard:sync_fence", "hdf_core:libhdi", + "multimedia_player_framework:media_client", + "window_manager:libdm", ] } diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 15dc171b491707d45491bbaa340a7840dc06628d..7afd6d5ecef0b0546e0053f41e52495cee0b8757 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -18,13 +18,10 @@ import( 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 +57,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 +75,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/screensourceprocessor/encoder/src/image_source_encoder.cpp b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp index cdbfef8bb52dd2aa0f809c12f87552d8151e30ce..b3df636f46077108d69a2b30b951be5b3676554a 100644 --- a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp +++ b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp @@ -24,7 +24,6 @@ #include #include -#include "display_type.h" #include "dscreen_constants.h" #include "dscreen_errcode.h" #include "dscreen_hisysevent.h" diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index f1c13ade55a169f2ce59fe0ee21bfc4b6314cb66..d11959597c9ea3c10246703c2b39a42b976b8a44 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -18,12 +18,10 @@ import( 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 +55,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 +74,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..52fde262386cf2da9db53a874cb99ac9c435c729 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -38,9 +38,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 +55,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..d804e04b36cc2f9d6e08893869483bdce787cb9f 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -57,13 +57,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..5a9b8dfb69674b6b5cdc2b19261da7a5a5caccaa 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -41,9 +41,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 +54,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..82983d0ca73e7433078128cdee9b08a413476d6d 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -39,10 +39,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", ] } @@ -67,6 +63,7 @@ ohos_unittest("SourceProcessorTest") { "c_utils:utils", "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..6d044e8b6a0d06638d17b2a6c936593a13facda5 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -44,11 +44,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 +63,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..4029a43d69198f91ce03db065daf925b43c2a548 100644 --- a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn +++ b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn @@ -45,13 +45,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 +65,10 @@ ohos_unittest("ScreenCallbackTest") { 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/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index c8b091dd48a3b66c41598cd222e8b8d50fe6278d..72ed6e3dd26d22e4157f89f11ba468596c6d6062 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -37,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/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/transport", ] }