From 45aaaf03aefbdfc9fcd189a200792019aafb3dac Mon Sep 17 00:00:00 2001 From: oh_ci Date: Thu, 22 May 2025 02:02:29 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!1608=20?= =?UTF-8?q?:=20drivers=5Finterface=E4=BB=93=E7=9A=84=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=AD=A6=E5=91=8A=E6=95=B4=E6=94=B9'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 | 14 ++++---------- 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, 12 insertions(+), 37 deletions(-) diff --git a/display/buffer/v1_0/BUILD.gn b/display/buffer/v1_0/BUILD.gn index 131e163d..ff5d1fbe 100644 --- a/display/buffer/v1_0/BUILD.gn +++ b/display/buffer/v1_0/BUILD.gn @@ -48,7 +48,6 @@ 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 e074f129..ff4b53d7 100644 --- a/display/buffer/v1_1/BUILD.gn +++ b/display/buffer/v1_1/BUILD.gn @@ -49,7 +49,6 @@ 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 077a0818..0e653085 100644 --- a/display/buffer/v1_2/BUILD.gn +++ b/display/buffer/v1_2/BUILD.gn @@ -15,9 +15,7 @@ import("//build/config/components/hdi/hdi.gni") hdi("display_buffer") { module_name = "display_buffer" - - proxy_deps = [ "../v1_0:libdisplay_buffer_proxy_1.0" ] - stub_deps = [ "../v1_0:libdisplay_buffer_stub_1.0" ] + imports = [ "ohos.hdi.display.buffer.v1_0:display_buffer" ] sources = [ "DisplayBufferType.idl", @@ -57,7 +55,6 @@ 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 51ba337c..a83df881 100644 --- a/display/composer/cache_manager/BUILD.gn +++ b/display/composer/cache_manager/BUILD.gn @@ -29,7 +29,6 @@ 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 6ccdab0e..43414a19 100644 --- a/display/composer/v1_0/BUILD.gn +++ b/display/composer/v1_0/BUILD.gn @@ -24,7 +24,7 @@ hdi("display_composer") { "IVBlankCallback.idl", ] - deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] + sequenceable_pub_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 dcd6428e..8c2bc255 100644 --- a/display/composer/v1_1/BUILD.gn +++ b/display/composer/v1_1/BUILD.gn @@ -15,9 +15,7 @@ import("//build/config/components/hdi/hdi.gni") hdi("display_composer") { module_name = "display_composer" - - proxy_deps = [ "../v1_0:libdisplay_composer_proxy_1.0" ] - stub_deps = [ "../v1_0:libdisplay_composer_stub_1.0" ] + imports = [ "ohos.hdi.display.composer.v1_0:display_composer" ] sources = [ "DisplayComposerType.idl", @@ -26,7 +24,7 @@ hdi("display_composer") { "ISeamlessChangeCallback.idl", ] - deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] + sequenceable_pub_deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] language = "cpp" subsystem_name = "hdf" @@ -54,7 +52,6 @@ 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 c4b338dd..51516abf 100644 --- a/display/composer/v1_2/BUILD.gn +++ b/display/composer/v1_2/BUILD.gn @@ -15,14 +15,9 @@ import("//build/config/components/hdi/hdi.gni") hdi("display_composer") { module_name = "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", + imports = [ + "ohos.hdi.display.composer.v1_0:display_composer", + "ohos.hdi.display.composer.v1_1:display_composer", ] sources = [ @@ -31,7 +26,7 @@ hdi("display_composer") { "IVBlankIdleCallback.idl", ] - deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] + sequenceable_pub_deps = [ "../hdifd_parcelable:libhdifd_parcelable" ] language = "cpp" subsystem_name = "hdf" @@ -59,7 +54,6 @@ ohos_shared_library("libdisplay_composer_hdi_impl_1.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/input/ddk/v1_1/BUILD.gn b/input/ddk/v1_1/BUILD.gn index 0aa97b05..cf55b1f6 100644 --- a/input/ddk/v1_1/BUILD.gn +++ b/input/ddk/v1_1/BUILD.gn @@ -14,8 +14,7 @@ import("//build/config/components/hdi/hdi.gni") hdi("hid_ddk") { module_name = "hid_ddk" - proxy_deps = [ "../v1_0:libhid_ddk_proxy_1.0" ] - stub_deps = [ "../v1_0:libhid_ddk_stub_1.0" ] + imports = [ "ohos.hdi.input.ddk.v1_0:hid_ddk" ] sources = [ "HidDdkTypes.idl", diff --git a/motion/v1_1/BUILD.gn b/motion/v1_1/BUILD.gn index 2cc0f389..1c67bbda 100644 --- a/motion/v1_1/BUILD.gn +++ b/motion/v1_1/BUILD.gn @@ -14,8 +14,7 @@ import("//build/config/components/hdi/hdi.gni") hdi("motion") { module_name = "motion_service" - proxy_deps = [ "../v1_0:libmotion_proxy_1.0" ] - stub_deps = [ "../v1_0:libmotion_stub_1.0" ] + imports = [ "ohos.hdi.motion.v1_0:motion" ] sources = [ "IMotionInterface.idl", "MotionTypes.idl", diff --git a/vibrator/v1_2/BUILD.gn b/vibrator/v1_2/BUILD.gn index 02894dc8..37cdec50 100644 --- a/vibrator/v1_2/BUILD.gn +++ b/vibrator/v1_2/BUILD.gn @@ -20,8 +20,7 @@ if (defined(ohos_lite)) { } else { hdi("vibrator") { module_name = "vibrator_service" - proxy_deps = [ "../v1_1:libvibrator_proxy_1.1" ] - stub_deps = [ "../v1_1:libvibrator_stub_1.1" ] + imports = [ "ohos.hdi.vibrator.v1_1:vibrator" ] sources = [ "IVibratorInterface.idl", diff --git a/vibrator/v1_3/BUILD.gn b/vibrator/v1_3/BUILD.gn index b8127e2b..bbc03b4f 100644 --- a/vibrator/v1_3/BUILD.gn +++ b/vibrator/v1_3/BUILD.gn @@ -20,14 +20,7 @@ if (defined(ohos_lite)) { } else { hdi("vibrator") { module_name = "vibrator_service" - 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", - ] + imports = [ "ohos.hdi.vibrator.v1_2:vibrator" ] sources = [ "IVibratorInterface.idl", -- Gitee