From a537204c46449a6dba6902dd63378312fedc15a9 Mon Sep 17 00:00:00 2001 From: huang-xl Date: Wed, 6 Apr 2022 16:13:09 +0800 Subject: [PATCH 1/2] inner_api Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: I9c9b92c2987f182a97237d9554ace8f4bcc8b3d6 --- screenhandler/BUILD.gn | 4 ++-- services/screenservice/sourceservice/BUILD.gn | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index 1f32267f..8b2e33c8 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -19,7 +19,7 @@ ohos_shared_library("distributed_screen_handler") { include_dirs = [ "//third_party/json/include", "${windowmanager_path}/interfaces/innerkits/dm", - "${mediastandard_path}/interfaces/innerkits/native/media/include", + "${mediastandard_path}/interfaces/inner_api/native", "${fwk_common_path}/utils/include", ] @@ -34,7 +34,7 @@ ohos_shared_library("distributed_screen_handler") { deps = [ "//utils/native/base:utils", - "${mediastandard_path}/interfaces/innerkits/native/media:media_client", + "${mediastandard_path}/interfaces/inner_api/native:media_client", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client", "${windowmanager_path}/dm:libdm", diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 499e9a1e..922c9844 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -24,7 +24,7 @@ ohos_shared_library("distributed_screen_source") { "//utils/system/safwk/native/include", "//foundation/graphic/standard/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", - "${mediastandard_path}/interfaces/innerkits/native/media/include", + "${mediastandard_path}/interfaces/inner_api/native", ] include_dirs += [ @@ -59,7 +59,7 @@ ohos_shared_library("distributed_screen_source") { deps = [ "${common_path}:distributed_screen_utils", - "${mediastandard_path}/interfaces/innerkits/native/media:media_client", + "${mediastandard_path}/interfaces/inner_api/native:media_client", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", "${windowmanager_path}/dm:libdm", "//foundation/graphic/standard/frameworks/surface:surface", -- Gitee From 7a39224c39c4e21bb136d42978514c8aed429adb Mon Sep 17 00:00:00 2001 From: huang-xl Date: Wed, 6 Apr 2022 16:34:09 +0800 Subject: [PATCH 2/2] inner_api Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: I36c79cbb3d9aacddbc0977460bd6d418441c0cd7 --- screenhandler/BUILD.gn | 77 ++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index 8b2e33c8..727296f6 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -13,45 +13,42 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import( + "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") ohos_shared_library("distributed_screen_handler") { - include_dirs = [ - "//third_party/json/include", - "${windowmanager_path}/interfaces/innerkits/dm", - "${mediastandard_path}/interfaces/inner_api/native", - "${fwk_common_path}/utils/include", - ] - - include_dirs += [ - "include", - "${common_path}/include", - ] - - sources = [ - "src/dscreen_handler.cpp", - ] - - deps = [ - "//utils/native/base:utils", - "${mediastandard_path}/interfaces/inner_api/native:media_client", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client", - "${windowmanager_path}/dm:libdm", - "${common_path}:distributed_screen_utils", - ] - - defines = [ - "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dscreenhandler\"", - "LOG_DOMAIN=0xD004100", - ] - - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - ] - - subsystem_name = "distributedhardware" - - part_name = "distributed_screen" -} \ No newline at end of file + 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", + ] + + sources = [ "src/dscreen_handler.cpp" ] + + deps = [ + "${common_path}:distributed_screen_utils", + "${mediastandard_path}/interfaces/inner_api/native:media_client", + "${windowmanager_path}/dm:libdm", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client", + "//utils/native/base:utils", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"dscreenhandler\"", + "LOG_DOMAIN=0xD004100", + ] + + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + + subsystem_name = "distributedhardware" + + part_name = "distributed_screen" +} -- Gitee