From a79d8791308d5a262b7f9aa05cac55285ca5dd7b Mon Sep 17 00:00:00 2001 From: xqq879988 Date: Sat, 17 May 2025 19:29:17 +0800 Subject: [PATCH] =?UTF-8?q?=20drivers=5Finterface=E4=BB=93=E7=9A=84?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E8=AD=A6=E5=91=8A=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xqq879988 --- audio/bundle.json | 4 ++-- camera/bundle.json | 10 +++++----- codec/bundle.json | 4 ++-- 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/bundle.json | 8 ++++++++ input/ddk/v1_1/BUILD.gn | 3 ++- light/bundle.json | 2 +- motion/bundle.json | 4 ++-- motion/v1_1/BUILD.gn | 3 ++- sensor/bundle.json | 2 +- vibrator/bundle.json | 6 +++--- vibrator/v1_2/BUILD.gn | 3 ++- vibrator/v1_3/BUILD.gn | 9 ++++++++- 19 files changed, 61 insertions(+), 28 deletions(-) diff --git a/audio/bundle.json b/audio/bundle.json index 6dd6f4e7..f0412d71 100644 --- a/audio/bundle.json +++ b/audio/bundle.json @@ -43,7 +43,7 @@ } }, { - "name": "//drivers/interface/audio/effect/v1_0:effect_idl_headers", + "name": "//drivers/interface/audio/effect/v1_0:effect_idl_headers_1.0", "header": { "header_files": [ ], @@ -67,7 +67,7 @@ } }, { - "name": "//drivers/interface/audio/v4_0:audio_idl_headers", + "name": "//drivers/interface/audio/v4_0:audio_idl_headers_4.0", "header": { "header_files": [ ], diff --git a/camera/bundle.json b/camera/bundle.json index af1701d6..cd53aaba 100644 --- a/camera/bundle.json +++ b/camera/bundle.json @@ -72,7 +72,7 @@ } }, { - "name": "//drivers/interface/camera/v1_4:camera_idl_headers", + "name": "//drivers/interface/camera/v1_4:camera_idl_headers_1.4", "header": { "header_files": [ ], @@ -96,7 +96,7 @@ } }, { - "name": "//drivers/interface/camera/v1_3:camera_idl_headers", + "name": "//drivers/interface/camera/v1_3:camera_idl_headers_1.3", "header": { "header_files": [ ], @@ -120,7 +120,7 @@ } }, { - "name": "//drivers/interface/camera/v1_2:camera_idl_headers", + "name": "//drivers/interface/camera/v1_2:camera_idl_headers_1.2", "header": { "header_files": [ ], @@ -144,7 +144,7 @@ } }, { - "name": "//drivers/interface/camera/v1_1:camera_idl_headers", + "name": "//drivers/interface/camera/v1_1:camera_idl_headers_1.1", "header": { "header_files": [ ], @@ -168,7 +168,7 @@ } }, { - "name": "//drivers/interface/camera/v1_0:camera_idl_headers", + "name": "//drivers/interface/camera/v1_0:camera_idl_headers_1.0", "header": { "header_files": [ ], diff --git a/codec/bundle.json b/codec/bundle.json index 5a09c82a..6c2cd0b4 100644 --- a/codec/bundle.json +++ b/codec/bundle.json @@ -42,7 +42,7 @@ } }, { - "name": "//drivers/interface/codec/v3_0:codec_idl_headers", + "name": "//drivers/interface/codec/v3_0:codec_idl_headers_3.0", "header": { "header_files": [ ], @@ -66,7 +66,7 @@ } }, { - "name": "//drivers/interface/codec/image/v2_0:image_idl_headers", + "name": "//drivers/interface/codec/image/v2_0:image_idl_headers_2.0", "header": { "header_files": [ ], 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..c4b338dd 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" @@ -54,6 +59,7 @@ 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/bundle.json b/input/bundle.json index cd050d0a..902b3268 100644 --- a/input/bundle.json +++ b/input/bundle.json @@ -66,6 +66,14 @@ "header_base": "//drivers/interface/input/ddk" } }, + { + "name": "//drivers/interface/input/ddk/v1_0:hid_ddk_idl_headers_1.0", + "header": { + "header_files": [ + ], + "header_base": "//drivers/interface/input/ddk" + } + }, { "name": "//drivers/interface/input/ddk/v1_0:hid_ddk_idl_headers", "header": { 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/light/bundle.json b/light/bundle.json index 545a4403..5e78ca32 100644 --- a/light/bundle.json +++ b/light/bundle.json @@ -49,7 +49,7 @@ } }, { - "name": "//drivers/interface/light/v1_0:light_idl_headers", + "name": "//drivers/interface/light/v1_0:light_idl_headers_1.0", "header": { "header_files": [ ], diff --git a/motion/bundle.json b/motion/bundle.json index d21a97fd..ab302f6f 100644 --- a/motion/bundle.json +++ b/motion/bundle.json @@ -53,7 +53,7 @@ } }, { - "name": "//drivers/interface/motion/v1_0:motion_idl_headers", + "name": "//drivers/interface/motion/v1_0:motion_idl_headers_1.0", "header": { "header_files": [ ], @@ -77,7 +77,7 @@ } }, { - "name": "//drivers/interface/motion/v1_1:motion_idl_headers", + "name": "//drivers/interface/motion/v1_1:motion_idl_headers_1.1", "header": { "header_files": [ ], 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/sensor/bundle.json b/sensor/bundle.json index 34857b18..04dc3b3b 100644 --- a/sensor/bundle.json +++ b/sensor/bundle.json @@ -50,7 +50,7 @@ } }, { - "name": "//drivers/interface/sensor/v2_0:sensor_idl_headers", + "name": "//drivers/interface/sensor/v2_0:sensor_idl_headers_2.0", "header": { "header_files": [ ], diff --git a/vibrator/bundle.json b/vibrator/bundle.json index 248f7407..bee63787 100644 --- a/vibrator/bundle.json +++ b/vibrator/bundle.json @@ -55,7 +55,7 @@ } }, { - "name": "//drivers/interface/vibrator/v1_1:vibrator_idl_headers", + "name": "//drivers/interface/vibrator/v1_1:vibrator_idl_headers_1.1", "header": { "header_files": [ ], @@ -79,7 +79,7 @@ } }, { - "name": "//drivers/interface/vibrator/v1_2:vibrator_idl_headers", + "name": "//drivers/interface/vibrator/v1_2:vibrator_idl_headers_1.2", "header": { "header_files": [ ], @@ -103,7 +103,7 @@ } }, { - "name": "//drivers/interface/vibrator/v1_3:vibrator_idl_headers", + "name": "//drivers/interface/vibrator/v1_3:vibrator_idl_headers_1.3", "header": { "header_files": [ ], 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