From c62ad3eb7f4d03353415ee0aa5413afe300d5194 Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Tue, 13 Jun 2023 16:37:47 +0800 Subject: [PATCH 1/5] gn modify Signed-off-by: wangxuanxuan --- bundle.json | 8 +++++--- common/BUILD.gn | 3 +-- services/common/test/unittest/utils/BUILD.gn | 5 ++++- services/screenclient/BUILD.gn | 2 +- services/screenclient/test/unittest/BUILD.gn | 2 +- services/screendemo/BUILD.gn | 2 +- services/screenservice/sinkservice/BUILD.gn | 2 +- services/screenservice/sourceservice/BUILD.gn | 2 +- services/screentransport/screensinktrans/BUILD.gn | 2 +- services/screentransport/screensourcetrans/BUILD.gn | 2 +- 10 files changed, 17 insertions(+), 13 deletions(-) diff --git a/bundle.json b/bundle.json index 0ae005f3..c08bff0e 100644 --- a/bundle.json +++ b/bundle.json @@ -7,7 +7,7 @@ "license":"Apache License 2.0", "publishAs":"code-segment", "segment":{ - "destPath":"foundation/distributedhardware/distributed_screen/" + "destPath":"foundation/distributedhardware/distributed_screen" }, "dirs":{}, "scripts":{}, @@ -39,10 +39,12 @@ "hitrace_native", "c_utils", "player_framework", - "window_manager" + "window_manager", + "multimedia_image_framework" ], "third_party":[ - "json" + "json", + "libjpeg_turbo" ] }, "build":{ diff --git a/common/BUILD.gn b/common/BUILD.gn index 75ec9a9d..e95dd645 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -24,8 +24,6 @@ ohos_shared_library("distributed_screen_utils") { "${fwk_common_path}/utils/include", ] - deps = [ "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk" ] - sources = [ "src/dscreen_hisysevent.cpp", "src/dscreen_json_util.cpp", @@ -41,6 +39,7 @@ ohos_shared_library("distributed_screen_utils") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "distributed_hardware_fwk:libdhfwk_sdk", ] defines = [ diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index 09998e28..664ff160 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -49,11 +49,14 @@ ohos_unittest("UtilsTest") { configs = [ ":module_private_config" ] deps = [ - "${fwk_interfaces_path}/inner_kits:libdhfwk_sdk", "${services_path}/screenservice/sinkservice:distributed_screen_sink", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] + + external_deps = [ + "distributed_hardware_fwk:libdhfwk_sdk", + ] } group("utils_test") { diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index bc3234d2..11c9bcc6 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -34,7 +34,6 @@ ohos_shared_library("distributed_screen_client") { deps = [ "${common_path}:distributed_screen_utils", - "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", ] defines = [ @@ -48,6 +47,7 @@ ohos_shared_library("distributed_screen_client") { "graphic_standard:surface", "input:libmmi-client", "window_manager:libwm", + "graphic_standard:librender_service_client", ] part_name = "distributed_screen" diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 8434798c..775b41c9 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -45,7 +45,6 @@ ohos_unittest("ScreenClientTest") { deps = [ "${common_path}:distributed_screen_utils", "${distributedscreen_path}/services/screenclient:distributed_screen_client", - "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -54,6 +53,7 @@ ohos_unittest("ScreenClientTest") { "graphic_standard:surface", "input:libmmi-client", "window_manager:libwm", + "graphic_standard:librender_service_client", ] } diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index 7513a2a7..d602f914 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -35,7 +35,6 @@ 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", @@ -58,6 +57,7 @@ ohos_executable("distributedScreenTest") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", + "graphic_standard:librender_service_client", ] cflags = [ "-Wall" ] diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index e3b67c77..b246cacb 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -54,7 +54,6 @@ ohos_shared_library("distributed_screen_sink") { deps = [ "${common_path}:distributed_screen_utils", - "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", "${services_path}/screenclient:distributed_screen_client", "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", ] @@ -75,6 +74,7 @@ ohos_shared_library("distributed_screen_sink") { "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", + "distributed_hardware_fwk:libdhfwk_sdk", ] subsystem_name = "distributedhardware" diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 91e4777d..70d48ec8 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -59,7 +59,6 @@ ohos_shared_library("distributed_screen_source") { deps = [ "${common_path}:distributed_screen_utils", - "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", ] @@ -80,6 +79,7 @@ ohos_shared_library("distributed_screen_source") { "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", + "distributed_hardware_fwk:libdhfwk_sdk", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index f5fc2c60..3d7e5b0a 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -56,7 +56,6 @@ ohos_shared_library("distributed_screen_sinktrans") { deps = [ "${common_path}:distributed_screen_utils", - "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", "//third_party/libjpeg-turbo:turbojpeg_static", ] @@ -80,6 +79,7 @@ ohos_shared_library("distributed_screen_sinktrans") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "player_framework:media_client", + "distributed_hardware_fwk:libdhfwk_sdk", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index ef9e18f8..1937d77d 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -55,7 +55,6 @@ ohos_shared_library("distributed_screen_sourcetrans") { deps = [ "${common_path}:distributed_screen_utils", - "${fwk_interfaces_path}/inner_kits:libdhfwk_sdk", "//third_party/libjpeg-turbo:turbojpeg_static", ] @@ -80,6 +79,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "player_framework:media_client", + "distributed_hardware_fwk:libdhfwk_sdk", ] subsystem_name = "distributedhardware" -- Gitee From a5266d7b1b9beeadbb1f35c32dced0f3d5371e1d Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Tue, 13 Jun 2023 17:24:38 +0800 Subject: [PATCH 2/5] gn modify Signed-off-by: wangxuanxuan --- bundle.json | 3 ++- common/BUILD.gn | 2 +- services/screenclient/BUILD.gn | 2 +- services/screenclient/test/unittest/BUILD.gn | 2 +- services/screendemo/BUILD.gn | 2 +- services/screenservice/sinkservice/BUILD.gn | 2 +- services/screenservice/sourceservice/BUILD.gn | 2 +- services/screentransport/screensinktrans/BUILD.gn | 2 +- services/screentransport/screensourcetrans/BUILD.gn | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/bundle.json b/bundle.json index c08bff0e..ef4881fe 100644 --- a/bundle.json +++ b/bundle.json @@ -40,7 +40,8 @@ "c_utils", "player_framework", "window_manager", - "multimedia_image_framework" + "multimedia_image_framework", + "distributed_hardware_fwk" ], "third_party":[ "json", diff --git a/common/BUILD.gn b/common/BUILD.gn index e95dd645..43dc9531 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -34,12 +34,12 @@ ohos_shared_library("distributed_screen_utils") { external_deps = [ "c_utils:utils", "c_utils:utilsbase", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "distributed_hardware_fwk:libdhfwk_sdk", ] defines = [ diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 11c9bcc6..f61660dd 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -44,10 +44,10 @@ ohos_shared_library("distributed_screen_client") { external_deps = [ "graphic_standard:libgraphic_utils", + "graphic_standard:librender_service_client", "graphic_standard:surface", "input:libmmi-client", "window_manager:libwm", - "graphic_standard:librender_service_client", ] part_name = "distributed_screen" diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 775b41c9..96345642 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -50,10 +50,10 @@ ohos_unittest("ScreenClientTest") { ] external_deps = [ + "graphic_standard:librender_service_client", "graphic_standard:surface", "input:libmmi-client", "window_manager:libwm", - "graphic_standard:librender_service_client", ] } diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index d602f914..4ff1efd1 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -51,13 +51,13 @@ ohos_executable("distributedScreenTest") { "access_token:libnativetoken", "access_token:libtoken_setproc", "dsoftbus:softbus_client", + "graphic_standard:librender_service_client", "graphic_standard:surface", "hiviewdfx_hilog_native:libhilog", "player_framework:media_client", "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "graphic_standard:librender_service_client", ] cflags = [ "-Wall" ] diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index b246cacb..45dc5331 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -66,6 +66,7 @@ ohos_shared_library("distributed_screen_sink") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "graphic_standard:libgraphic_utils", "graphic_standard:surface", "hisysevent_native:libhisysevent", @@ -74,7 +75,6 @@ ohos_shared_library("distributed_screen_sink") { "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", - "distributed_hardware_fwk:libdhfwk_sdk", ] subsystem_name = "distributedhardware" diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 70d48ec8..0029ec5a 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -70,6 +70,7 @@ ohos_shared_library("distributed_screen_source") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "graphic_standard:libcomposer", "graphic_standard:surface", "hisysevent_native:libhisysevent", @@ -79,7 +80,6 @@ ohos_shared_library("distributed_screen_source") { "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", - "distributed_hardware_fwk:libdhfwk_sdk", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 3d7e5b0a..0d57fdf6 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -73,13 +73,13 @@ ohos_shared_library("distributed_screen_sinktrans") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "graphic_standard:surface", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "player_framework:media_client", - "distributed_hardware_fwk:libdhfwk_sdk", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index 1937d77d..f01fede9 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -72,6 +72,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "graphic_standard:surface", "graphic_standard:sync_fence", @@ -79,7 +80,6 @@ ohos_shared_library("distributed_screen_sourcetrans") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "player_framework:media_client", - "distributed_hardware_fwk:libdhfwk_sdk", ] subsystem_name = "distributedhardware" -- Gitee From 6fdc6d68dd40eb271135f507ca15f52eea6af92f Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Tue, 13 Jun 2023 19:03:06 +0800 Subject: [PATCH 3/5] gn modify Signed-off-by: wangxuanxuan --- services/common/test/unittest/utils/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index 664ff160..20c747a7 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -54,9 +54,7 @@ ohos_unittest("UtilsTest") { "//third_party/googletest:gtest_main", ] - external_deps = [ - "distributed_hardware_fwk:libdhfwk_sdk", - ] + external_deps = [ "distributed_hardware_fwk:libdhfwk_sdk" ] } group("utils_test") { -- Gitee From bd25e72611022ebdccf4f06fc48a8865de9f7fb6 Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Tue, 13 Jun 2023 21:14:13 +0800 Subject: [PATCH 4/5] gn modify Signed-off-by: wangxuanxuan --- services/screenclient/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index f61660dd..5fff315c 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -32,9 +32,7 @@ ohos_shared_library("distributed_screen_client") { "${services_path}/screenclient/src/screen_client_window_adapter.cpp", ] - deps = [ - "${common_path}:distributed_screen_utils", - ] + deps = [ "${common_path}:distributed_screen_utils" ] defines = [ "HI_LOG_ENABLE", -- Gitee From 323e1386dbbf7e45ea0a28c2b8b38bc84762441e Mon Sep 17 00:00:00 2001 From: wangxuanxuan Date: Wed, 14 Jun 2023 20:24:40 +0800 Subject: [PATCH 5/5] gn modify Signed-off-by: wangxuanxuan --- services/common/test/unittest/utils/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index 20c747a7..6ac2f2da 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Huawei Device Co., Ltd. +# Copyright (c) 2022-2023 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -- Gitee