From 6b8651f6f9e6e1f1d3fd7f2f79e956f04ff861bc Mon Sep 17 00:00:00 2001 From: qinlong Date: Tue, 6 Sep 2022 14:25:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4UT=E4=B8=AD=E7=9A=84=E5=86=97?= =?UTF-8?q?=E4=BD=99=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong --- .../test/unittest/screensinktest/BUILD.gn | 17 +++-------------- .../test/unittest/screensourcetest/BUILD.gn | 10 +--------- .../common/test/unittest/databuffer/BUILD.gn | 11 +---------- services/common/test/unittest/utils/BUILD.gn | 11 +---------- .../test/unittest/screendatachannel/BUILD.gn | 13 ++++--------- .../test/unittest/screensinkprocessor/BUILD.gn | 4 ---- .../test/unittest/screensinktrans/BUILD.gn | 8 ++++---- .../unittest/screensourceprocessor/BUILD.gn | 9 ++++----- .../test/unittest/screensourcetrans/BUILD.gn | 18 +++++++++--------- services/softbusadapter/test/unittest/BUILD.gn | 13 ++++--------- 10 files changed, 31 insertions(+), 83 deletions(-) diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index 60e39f9f..ae81ebc8 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include", ] @@ -36,6 +35,7 @@ config("module_private_config") { "${interfaces_path}/innerkits/native_cpp/screen_sink/include", "${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", ] } @@ -48,23 +48,12 @@ ohos_unittest("ScreenSinkTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "${interfaces_path}/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] - external_deps = [ - "c_utils:utils", - "dsoftbus:softbus_client", - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", - "multimedia_player_framework:media_client", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - ] + external_deps = [ "c_utils:utils" ] } group("screen_sink_test") { diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index 1af27df6..a7a9126b 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include", ] @@ -53,22 +52,15 @@ ohos_unittest("ScreenSourceTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", + "${interfaces_path}/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", - "dsoftbus:softbus_client", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimedia_player_framework:media_client", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] } diff --git a/services/common/test/unittest/databuffer/BUILD.gn b/services/common/test/unittest/databuffer/BUILD.gn index 89ae6f13..0a323b9e 100644 --- a/services/common/test/unittest/databuffer/BUILD.gn +++ b/services/common/test/unittest/databuffer/BUILD.gn @@ -21,9 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${windowmanager_path}/interfaces/innerkits/wm", - "${graphicstandard_path}/interfaces/innerkits/surface", - "${graphicstandard_path}/rosen/modules/render_service_client/core/ui", "${fwk_common_path}/utils/include", "${fwk_common_path}/log/include", "${fwk_utils_path}/include/log", @@ -48,16 +45,10 @@ ohos_unittest("DataBufferTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", - "${graphicstandard_path}/frameworks/surface:surface", - "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", - "${windowmanager_path}/wm:libwm", - "//foundation/distributedhardware/distributed_screen/services/screentransport/screensinktrans:distributed_screen_sinktrans", + "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] - - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } group("data_buffer_test") { diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index e1fc24e4..559366ad 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -22,9 +22,6 @@ config("module_private_config") { include_dirs = [ "//third_party/json/include", - "${windowmanager_path}/interfaces/innerkits/wm", - "${graphicstandard_path}/interfaces/innerkits/surface", - "${graphicstandard_path}/rosen/modules/render_service_client/core/ui", "${fwk_common_path}/utils/include", "${fwk_common_path}/log/include", "${fwk_utils_path}/include/log", @@ -50,16 +47,10 @@ ohos_unittest("UtilsTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", - "${graphicstandard_path}/frameworks/surface:surface", - "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", - "${windowmanager_path}/wm:libwm", - "//foundation/distributedhardware/distributed_screen/services/screenservice/sinkservice:distributed_screen_sink", + "${services_path}/screenservice/sinkservice:distributed_screen_sink", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] - - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } group("utils_test") { diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn index fcce9b88..ca1e1aa7 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", ] @@ -39,6 +38,9 @@ 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", ] } @@ -51,19 +53,12 @@ ohos_unittest("DataChannelTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "//foundation/graphic/graphic_2d/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] - external_deps = [ - "c_utils:utils", - "dsoftbus:softbus_client", - "hiviewdfx_hilog_native:libhilog", - "multimedia_player_framework:media_client", - ] + external_deps = [ "c_utils:utils" ] defines = [ "HI_LOG_ENABLE", diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index adf14c40..00dee821 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", ] @@ -56,7 +55,6 @@ ohos_unittest("SinkProcessorTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", "//foundation/graphic/graphic_2d/frameworks/surface:surface", "//third_party/googletest:gmock", @@ -65,8 +63,6 @@ ohos_unittest("SinkProcessorTest") { external_deps = [ "c_utils:utils", - "dsoftbus:softbus_client", - "hiviewdfx_hilog_native:libhilog", "multimedia_player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 31fbbb10..d063838c 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", ] @@ -40,6 +39,10 @@ config("module_private_config") { "${services_path}/screentransport/screensinkprocessor/include", "${services_path}/screentransport/screensinkprocessor/decoder/include", "${services_path}/softbusadapter/include", + "//foundation/multimedia/player_framework/interfaces/inner_api/native", + "//foundation/communication/dsoftbus/interfaces/kits/transport", + "//foundation/graphic/graphic_2d/utils/buffer_handle/export", + "//drivers/peripheral/base", ] } @@ -52,7 +55,6 @@ ohos_unittest("SinkTransTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", "//foundation/graphic/graphic_2d/frameworks/surface:surface", "//third_party/googletest:gmock", @@ -61,8 +63,6 @@ ohos_unittest("SinkTransTest") { external_deps = [ "c_utils:utils", - "dsoftbus:softbus_client", - "hiviewdfx_hilog_native:libhilog", "multimedia_player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index 74964940..8eb240cb 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", ] @@ -40,6 +39,10 @@ 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", ] } @@ -55,17 +58,13 @@ ohos_unittest("SourceProcessorTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "//foundation/graphic/graphic_2d/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", - "dsoftbus:softbus_client", - "hiviewdfx_hilog_native:libhilog", "multimedia_player_framework:media_client", ] } diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index ac2f3a71..0cff7b2d 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", @@ -43,6 +42,14 @@ config("module_private_config") { "${services_path}/screentransport/screensourceprocessor/include", "${services_path}/screentransport/screensourceprocessor/encoder/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", + "//foundation/communication/dsoftbus/interfaces/kits/transport", ] } @@ -55,19 +62,12 @@ ohos_unittest("SourceTransTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "//foundation/graphic/graphic_2d/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] - external_deps = [ - "c_utils:utils", - "dsoftbus:softbus_client", - "hiviewdfx_hilog_native:libhilog", - "multimedia_player_framework:media_client", - ] + external_deps = [ "c_utils:utils" ] } group("source_trans_test") { diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index f28fdfc8..9aa6673b 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "//third_party/json/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", ] @@ -38,6 +37,9 @@ 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", ] } @@ -50,19 +52,12 @@ ohos_unittest("SoftBusAdapterTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "//foundation/graphic/graphic_2d/frameworks/surface:surface", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] - external_deps = [ - "c_utils:utils", - "dsoftbus:softbus_client", - "hiviewdfx_hilog_native:libhilog", - "multimedia_player_framework:media_client", - ] + external_deps = [ "c_utils:utils" ] } group("soft_bus_adapter_test") { -- Gitee