diff --git a/display/buffer/v1_0/BUILD.gn b/display/buffer/v1_0/BUILD.gn index 131e163df21ab09ca414ca051aff95fa76235862..ff5d1fbe620ec5798076bd6c824fb8122dfce733 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 e074f129211865ce655bfa7a9e0f18e7e3816e68..ff4b53d7e87f3e30f7d49eb0b88c708254cb4b11 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 077a0818d2dc469342e7f413d639bbb1d7aa6a37..0e6530855c1e46acbc568ba3b039b4fd0dfd160c 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 51ba337c24e2c1c743738b96ab4989f6fa9bef75..a83df8816a8c55694788a75fd5c74b0fbd285005 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 6ccdab0eb65915a2e85aa24b0d4544c6a9158ab1..43414a19c4ff02c9c62dac44ff953e31caa35da3 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 dcd6428e580fe5884d21bc0430612c3bd8929d03..8c2bc255e6446f051464c89299ce0f27e68e291d 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 c4b338ddaa97ce46ef40aedccade42300698496f..51516abf26fc79c6c3a9231de89400e2f3f11cb0 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 0aa97b0544fe1d97e9426661d65302e5efdb84d9..cf55b1f67869cdb166c18e5b7040114f49f5a15a 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 2cc0f389a3109e21b5be9da4d941a19646e5232d..1c67bbdab3519a533353025cc8e23a0ebdc84fa9 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 02894dc8c1704d07856ad7377e4582cc348cba83..37cdec50179887bbae6cffba62175dfe5e68b99b 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 b8127e2bc1282aaeee3e7d67d4d1c035c37e0d67..bbc03b4fda1c3d76b27936f69b041f884652e07a 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",