From f99d5f7bf5bdbe4f273511d3113921b791e3d90a Mon Sep 17 00:00:00 2001 From: xqq879988 Date: Thu, 22 May 2025 18:09:58 +0800 Subject: [PATCH] =?UTF-8?q?interface=E6=8E=A5=E5=8F=A3=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=9A=84=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xqq879988 --- display/buffer/v1_0/BUILD.gn | 1 + display/buffer/v1_1/BUILD.gn | 1 + display/buffer/v1_2/BUILD.gn | 5 ++++- display/composer/cache_manager/BUILD.gn | 1 + display/composer/v1_0/BUILD.gn | 2 +- display/composer/v1_1/BUILD.gn | 7 +++++-- display/composer/v1_2/BUILD.gn | 15 +++++++++++---- input/ddk/v1_1/BUILD.gn | 3 ++- motion/v1_1/BUILD.gn | 3 ++- vibrator/v1_2/BUILD.gn | 3 ++- vibrator/v1_3/BUILD.gn | 9 ++++++++- 11 files changed, 38 insertions(+), 12 deletions(-) diff --git a/display/buffer/v1_0/BUILD.gn b/display/buffer/v1_0/BUILD.gn index ff5d1fbe..131e163d 100644 --- a/display/buffer/v1_0/BUILD.gn +++ b/display/buffer/v1_0/BUILD.gn @@ -48,6 +48,7 @@ ohos_shared_library("libdisplay_buffer_hdi_impl") { external_deps = [ "c_utils:utils", "graphic_surface:buffer_handle", + "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", "hdf_core:libpub_utils", "hilog:libhilog", diff --git a/display/buffer/v1_1/BUILD.gn b/display/buffer/v1_1/BUILD.gn index ff4b53d7..e074f129 100644 --- a/display/buffer/v1_1/BUILD.gn +++ b/display/buffer/v1_1/BUILD.gn @@ -49,6 +49,7 @@ ohos_shared_library("libdisplay_buffer_hdi_impl_v1_1") { external_deps = [ "c_utils:utils", "graphic_surface:buffer_handle", + "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", "hdf_core:libpub_utils", "hilog:libhilog", diff --git a/display/buffer/v1_2/BUILD.gn b/display/buffer/v1_2/BUILD.gn index 0e653085..077a0818 100644 --- a/display/buffer/v1_2/BUILD.gn +++ b/display/buffer/v1_2/BUILD.gn @@ -15,7 +15,9 @@ import("//build/config/components/hdi/hdi.gni") hdi("display_buffer") { module_name = "display_buffer" - imports = [ "ohos.hdi.display.buffer.v1_0:display_buffer" ] + + proxy_deps = [ "../v1_0:libdisplay_buffer_proxy_1.0" ] + stub_deps = [ "../v1_0:libdisplay_buffer_stub_1.0" ] sources = [ "DisplayBufferType.idl", @@ -55,6 +57,7 @@ ohos_shared_library("libdisplay_buffer_hdi_impl_v1_2") { external_deps = [ "c_utils:utils", "graphic_surface:buffer_handle", + "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", "hdf_core:libpub_utils", "hilog:libhilog", diff --git a/display/composer/cache_manager/BUILD.gn b/display/composer/cache_manager/BUILD.gn index a83df881..51ba337c 100644 --- a/display/composer/cache_manager/BUILD.gn +++ b/display/composer/cache_manager/BUILD.gn @@ -29,6 +29,7 @@ ohos_shared_library("libcomposer_buffer_cache") { "//drivers/interface/display/buffer/v1_0:libdisplay_buffer_stub_1.0", "//drivers/interface/display/buffer/v1_1:libdisplay_buffer_stub_1.1", "//drivers/interface/display/buffer/v1_2:libdisplay_buffer_stub_1.2", + "//drivers/interface/display/composer/hdifd_parcelable:libhdifd_parcelable", "//drivers/interface/display/composer/v1_0:libdisplay_composer_proxy_1.0", ] diff --git a/display/composer/v1_0/BUILD.gn b/display/composer/v1_0/BUILD.gn index 43414a19..6ccdab0e 100644 --- a/display/composer/v1_0/BUILD.gn +++ b/display/composer/v1_0/BUILD.gn @@ -24,7 +24,7 @@ hdi("display_composer") { "IVBlankCallback.idl", ] - sequenceable_pub_deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] + deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] language = "cpp" subsystem_name = "hdf" diff --git a/display/composer/v1_1/BUILD.gn b/display/composer/v1_1/BUILD.gn index 8c2bc255..dcd6428e 100644 --- a/display/composer/v1_1/BUILD.gn +++ b/display/composer/v1_1/BUILD.gn @@ -15,7 +15,9 @@ import("//build/config/components/hdi/hdi.gni") hdi("display_composer") { module_name = "display_composer" - imports = [ "ohos.hdi.display.composer.v1_0:display_composer" ] + + proxy_deps = [ "../v1_0:libdisplay_composer_proxy_1.0" ] + stub_deps = [ "../v1_0:libdisplay_composer_stub_1.0" ] sources = [ "DisplayComposerType.idl", @@ -24,7 +26,7 @@ hdi("display_composer") { "ISeamlessChangeCallback.idl", ] - sequenceable_pub_deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] + deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] language = "cpp" subsystem_name = "hdf" @@ -52,6 +54,7 @@ ohos_shared_library("libdisplay_composer_hdi_impl_1.1") { external_deps = [ "c_utils:utils", "graphic_surface:buffer_handle", + "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", "hdf_core:libpub_utils", "hilog:libhilog", diff --git a/display/composer/v1_2/BUILD.gn b/display/composer/v1_2/BUILD.gn index 51516abf..7a98f397 100644 --- a/display/composer/v1_2/BUILD.gn +++ b/display/composer/v1_2/BUILD.gn @@ -15,9 +15,14 @@ import("//build/config/components/hdi/hdi.gni") hdi("display_composer") { module_name = "display_composer" - imports = [ - "ohos.hdi.display.composer.v1_0:display_composer", - "ohos.hdi.display.composer.v1_1:display_composer", + + proxy_deps = [ + "../v1_0:libdisplay_composer_proxy_1.0", + "../v1_1:libdisplay_composer_proxy_1.1", + ] + stub_deps = [ + "../v1_0:libdisplay_composer_stub_1.0", + "../v1_1:libdisplay_composer_stub_1.1", ] sources = [ @@ -26,7 +31,7 @@ hdi("display_composer") { "IVBlankIdleCallback.idl", ] - sequenceable_pub_deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] + deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] language = "cpp" subsystem_name = "hdf" @@ -48,12 +53,14 @@ ohos_shared_library("libdisplay_composer_hdi_impl_1.2") { deps = [ ":libdisplay_composer_proxy_1.2", "../hdifd_parcelable:libhdifd_parcelable", + "../v1_0:libdisplay_composer_proxy_1.0", "../v1_1:libdisplay_composer_proxy_1.1", ] external_deps = [ "c_utils:utils", "graphic_surface:buffer_handle", + "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", "hdf_core:libpub_utils", "hilog:libhilog", diff --git a/input/ddk/v1_1/BUILD.gn b/input/ddk/v1_1/BUILD.gn index cf55b1f6..0aa97b05 100644 --- a/input/ddk/v1_1/BUILD.gn +++ b/input/ddk/v1_1/BUILD.gn @@ -14,7 +14,8 @@ import("//build/config/components/hdi/hdi.gni") hdi("hid_ddk") { module_name = "hid_ddk" - imports = [ "ohos.hdi.input.ddk.v1_0:hid_ddk" ] + proxy_deps = [ "../v1_0:libhid_ddk_proxy_1.0" ] + stub_deps = [ "../v1_0:libhid_ddk_stub_1.0" ] sources = [ "HidDdkTypes.idl", diff --git a/motion/v1_1/BUILD.gn b/motion/v1_1/BUILD.gn index 1c67bbda..2cc0f389 100644 --- a/motion/v1_1/BUILD.gn +++ b/motion/v1_1/BUILD.gn @@ -14,7 +14,8 @@ import("//build/config/components/hdi/hdi.gni") hdi("motion") { module_name = "motion_service" - imports = [ "ohos.hdi.motion.v1_0:motion" ] + proxy_deps = [ "../v1_0:libmotion_proxy_1.0" ] + stub_deps = [ "../v1_0:libmotion_stub_1.0" ] sources = [ "IMotionInterface.idl", "MotionTypes.idl", diff --git a/vibrator/v1_2/BUILD.gn b/vibrator/v1_2/BUILD.gn index 37cdec50..02894dc8 100644 --- a/vibrator/v1_2/BUILD.gn +++ b/vibrator/v1_2/BUILD.gn @@ -20,7 +20,8 @@ if (defined(ohos_lite)) { } else { hdi("vibrator") { module_name = "vibrator_service" - imports = [ "ohos.hdi.vibrator.v1_1:vibrator" ] + proxy_deps = [ "../v1_1:libvibrator_proxy_1.1" ] + stub_deps = [ "../v1_1:libvibrator_stub_1.1" ] sources = [ "IVibratorInterface.idl", diff --git a/vibrator/v1_3/BUILD.gn b/vibrator/v1_3/BUILD.gn index bbc03b4f..b8127e2b 100644 --- a/vibrator/v1_3/BUILD.gn +++ b/vibrator/v1_3/BUILD.gn @@ -20,7 +20,14 @@ if (defined(ohos_lite)) { } else { hdi("vibrator") { module_name = "vibrator_service" - imports = [ "ohos.hdi.vibrator.v1_2:vibrator" ] + proxy_deps = [ + "../v1_1:libvibrator_proxy_1.1", + "../v1_2:libvibrator_proxy_1.2", + ] + stub_deps = [ + "../v1_1:libvibrator_stub_1.1", + "../v1_2:libvibrator_stub_1.2", + ] sources = [ "IVibratorInterface.idl", -- Gitee