From 1a63c90b95955d4d335b6ab08d012c107fad7510 Mon Sep 17 00:00:00 2001 From: huang-xl Date: Fri, 24 Feb 2023 10:21:23 +0800 Subject: [PATCH 1/6] inner_api config Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: Iace9d92a37b8301da539f6d2c810f57fb57762bb --- screenhandler/BUILD.gn | 4 ++++ services/screenservice/sourceservice/BUILD.gn | 5 +++++ .../test/unittest/screensourceprocessor/BUILD.gn | 5 ++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index 2f1199d5..32c2b620 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -36,6 +36,10 @@ ohos_shared_library("distributed_screen_handler") { sources = [ "src/dscreen_handler.cpp" ] + configs = [ + "//foundation/graphic/graphic_2d/frameworks/surface:surface_public_config", + ] + deps = [ "${common_path}:distributed_screen_utils", "${mediastandard_path}/interfaces/inner_api/native:media_client", diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index c861b69b..03ca42ea 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -48,6 +48,7 @@ ohos_shared_library("distributed_screen_source") { "//drivers/peripheral/base", "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", "//foundation/graphic/graphic_2d/utils/buffer_handle/export", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", ] sources = [ @@ -64,6 +65,10 @@ ohos_shared_library("distributed_screen_source") { "./dscreenservice/src/dscreen_source_stub.cpp", ] + configs = [ + "//foundation/graphic/graphic_2d/frameworks/surface:surface_public_config", + ] + deps = [ "${common_path}:distributed_screen_utils", "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index 8eb240cb..a8ebf1ea 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -55,7 +55,10 @@ ohos_unittest("SourceProcessorTest") { "${services_path}/screentransport/test/unittest/screensourceprocessor/src/image_source_processor_test.cpp", ] - configs = [ ":module_private_config" ] + configs = [ + ":module_private_config", + "//foundation/graphic/graphic_2d/frameworks/surface:surface_public_config", + ] deps = [ "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", -- Gitee From 9913af7e17e43f6610e78872d0b8a9da742c0db5 Mon Sep 17 00:00:00 2001 From: huang-xl Date: Fri, 24 Feb 2023 11:28:58 +0800 Subject: [PATCH 2/6] inner_api config Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: I0db3c7f65d38e7085d3bab13b4066714e432cb99 --- screenhandler/BUILD.gn | 9 ++++----- services/screenservice/sourceservice/BUILD.gn | 5 +---- .../test/unittest/screensourceprocessor/BUILD.gn | 6 ++---- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index 32c2b620..ea081990 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -36,10 +36,6 @@ ohos_shared_library("distributed_screen_handler") { sources = [ "src/dscreen_handler.cpp" ] - configs = [ - "//foundation/graphic/graphic_2d/frameworks/surface:surface_public_config", - ] - deps = [ "${common_path}:distributed_screen_utils", "${mediastandard_path}/interfaces/inner_api/native:media_client", @@ -52,7 +48,10 @@ ohos_shared_library("distributed_screen_handler") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "graphic_standard:surface", + ] subsystem_name = "distributedhardware" diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 03ca42ea..ca16a8bc 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -65,10 +65,6 @@ ohos_shared_library("distributed_screen_source") { "./dscreenservice/src/dscreen_source_stub.cpp", ] - configs = [ - "//foundation/graphic/graphic_2d/frameworks/surface:surface_public_config", - ] - deps = [ "${common_path}:distributed_screen_utils", "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", @@ -88,6 +84,7 @@ ohos_shared_library("distributed_screen_source") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "graphic_standard:surface", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index a8ebf1ea..2f9e2258 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -55,10 +55,7 @@ ohos_unittest("SourceProcessorTest") { "${services_path}/screentransport/test/unittest/screensourceprocessor/src/image_source_processor_test.cpp", ] - configs = [ - ":module_private_config", - "//foundation/graphic/graphic_2d/frameworks/surface:surface_public_config", - ] + configs = [ ":module_private_config" ] deps = [ "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", @@ -69,6 +66,7 @@ ohos_unittest("SourceProcessorTest") { external_deps = [ "c_utils:utils", "multimedia_player_framework:media_client", + "graphic_standard:surface", ] } -- Gitee From b29e4bed75321317ef70a6cd9ca2dc7202d90b9e Mon Sep 17 00:00:00 2001 From: huang-xl Date: Fri, 24 Feb 2023 14:51:43 +0800 Subject: [PATCH 3/6] inner_api config Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: I8c65898bd233780eb28e2fa12dbe4183fc6230ee --- services/screenservice/sourceservice/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index ca16a8bc..c43acac9 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -48,7 +48,6 @@ ohos_shared_library("distributed_screen_source") { "//drivers/peripheral/base", "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//foundation/multimedia/image_framework/interfaces/innerkits/include", ] sources = [ @@ -85,6 +84,7 @@ ohos_shared_library("distributed_screen_source") { "safwk:system_ability_fwk", "samgr:samgr_proxy", "graphic_standard:surface", + "multimedia_image_framework:image_native", ] subsystem_name = "distributedhardware" -- Gitee From 2250c207380963fbf41f468620bb97d52c45318b Mon Sep 17 00:00:00 2001 From: huang-xl Date: Fri, 24 Feb 2023 18:05:29 +0800 Subject: [PATCH 4/6] inner_api config Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: Ia3b20ade2e4bcf3b1be1822edbe566cc74c4bb6d --- services/screenservice/sourceservice/BUILD.gn | 4 ++-- .../test/unittest/screensourceprocessor/BUILD.gn | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index c43acac9..7927c161 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -80,11 +80,11 @@ ohos_shared_library("distributed_screen_source") { external_deps = [ "c_utils:utils", + "graphic_standard:surface", "ipc:ipc_core", + "multimedia_image_framework:image_native", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "graphic_standard:surface", - "multimedia_image_framework:image_native", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index 2f9e2258..ddc96c5d 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -65,8 +65,8 @@ ohos_unittest("SourceProcessorTest") { external_deps = [ "c_utils:utils", - "multimedia_player_framework:media_client", "graphic_standard:surface", + "multimedia_player_framework:media_client", ] } -- Gitee From 38d0d1ee95cd492fdd17be9772cd9f7ec4bf9561 Mon Sep 17 00:00:00 2001 From: huang-xl Date: Sat, 25 Feb 2023 10:08:13 +0800 Subject: [PATCH 5/6] inner_api config Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: I0af7fac004556d8829c79f86ce79674c4fa5d72b --- .../screentransport/test/unittest/screensinkprocessor/BUILD.gn | 1 - services/screentransport/test/unittest/screensinktrans/BUILD.gn | 1 - 2 files changed, 2 deletions(-) diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index 00dee821..d9a701be 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -72,7 +72,6 @@ ohos_unittest("SinkProcessorTest") { "LOG_DOMAIN=0xD004100", ] - remove_configs = [ "//build/config/compiler:no_rtti" ] cflags = [ "-frtti" ] cflags_cc = cflags } diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index d063838c..129f5edf 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -72,7 +72,6 @@ ohos_unittest("SinkTransTest") { "LOG_DOMAIN=0xD004100", ] - remove_configs = [ "//build/config/compiler:no_rtti" ] cflags = [ "-frtti" ] cflags_cc = cflags } -- Gitee From 0f6a3580eea12696c9f5f401818c0968cffeb39a Mon Sep 17 00:00:00 2001 From: huang-xl Date: Sat, 25 Feb 2023 15:29:23 +0800 Subject: [PATCH 6/6] inner_api config Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: Ic65bab6ae4dabcd31163fdc33b675de9f2e216c2 --- screenhandler/BUILD.gn | 2 +- services/screenservice/sourceservice/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index ea081990..60138066 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -38,7 +38,6 @@ ohos_shared_library("distributed_screen_handler") { deps = [ "${common_path}:distributed_screen_utils", - "${mediastandard_path}/interfaces/inner_api/native:media_client", "${windowmanager_path}/dm:libdm", ] @@ -51,6 +50,7 @@ ohos_shared_library("distributed_screen_handler") { external_deps = [ "c_utils:utils", "graphic_standard:surface", + "multimedia_player_framework:media_client", ] subsystem_name = "distributedhardware" diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 7927c161..a9cb9d7e 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -67,7 +67,6 @@ 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", ] @@ -83,6 +82,7 @@ ohos_shared_library("distributed_screen_source") { "graphic_standard:surface", "ipc:ipc_core", "multimedia_image_framework:image_native", + "multimedia_player_framework:media_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] -- Gitee