diff --git a/audio/bundle.json b/audio/bundle.json index 6dd6f4e7fed9dca7c290049a549202562753665a..f0412d714dda5b4042fc6c7a56b1bac52cd3fad9 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 af1701d6a06b54361fef6a6b6c475312e6c9ef88..cd53aaba95e17a4f052d188f515fb591e38ae825 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 5a09c82a8dfd930a375ac6360ef2617fb29bf9e3..6c2cd0b40669de59b2fdff790d910db8516876b7 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 ff5d1fbe620ec5798076bd6c824fb8122dfce733..131e163df21ab09ca414ca051aff95fa76235862 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 ff4b53d7e87f3e30f7d49eb0b88c708254cb4b11..e074f129211865ce655bfa7a9e0f18e7e3816e68 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 0e6530855c1e46acbc568ba3b039b4fd0dfd160c..077a0818d2dc469342e7f413d639bbb1d7aa6a37 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 a83df8816a8c55694788a75fd5c74b0fbd285005..51ba337c24e2c1c743738b96ab4989f6fa9bef75 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 43414a19c4ff02c9c62dac44ff953e31caa35da3..6ccdab0eb65915a2e85aa24b0d4544c6a9158ab1 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 8c2bc255e6446f051464c89299ce0f27e68e291d..dcd6428e580fe5884d21bc0430612c3bd8929d03 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 51516abf26fc79c6c3a9231de89400e2f3f11cb0..c4b338ddaa97ce46ef40aedccade42300698496f 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 cd050d0acfcf46d345faa66f66c52711d0c55443..902b3268fddd3c88364c77304bca7d33b145243c 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 cf55b1f67869cdb166c18e5b7040114f49f5a15a..0aa97b0544fe1d97e9426661d65302e5efdb84d9 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 545a44035a443701d512ebfdd504da4bdd9b2ab0..5e78ca32587727a9c48a41304e4ea363534e5c19 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 d21a97fdd4bed693216648334d39fb7de1eca0d6..ab302f6f6044bf3c07abc927fc6b88f57831a7a2 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 1c67bbdab3519a533353025cc8e23a0ebdc84fa9..2cc0f389a3109e21b5be9da4d941a19646e5232d 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 34857b186c3c8be643732cd891f50d51a1c2407f..04dc3b3b750b2c3aecd544fcb4d207ce263e8ff3 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 248f7407420f30b04960e47709128dc0cd89d7b4..bee637876a07c2e5331374221a23f1befe223198 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 37cdec50179887bbae6cffba62175dfe5e68b99b..02894dc8c1704d07856ad7377e4582cc348cba83 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 bbc03b4fda1c3d76b27936f69b041f884652e07a..b8127e2bc1282aaeee3e7d67d4d1c035c37e0d67 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",