From 43a3e5f7d923f12abd7a4afda5fac83f4574018c Mon Sep 17 00:00:00 2001 From: JasonYujia Date: Thu, 23 Jun 2022 15:09:55 +0000 Subject: [PATCH] fix:modify hdf display driver component name Signed-off-by: JasonYujia --- camera/bundle.json | 2 +- camera/hal/buffer_manager/BUILD.gn | 4 ++-- camera/hal/init/BUILD.gn | 2 +- camera/hal/test/fuzz/BUILD.gn | 14 +++++++------- codec/test/demo/v2.0/BUILD.gn | 4 ++-- codec/test/unittest/hdi_omx/BUILD.gn | 2 +- display/bundle.json | 4 ++-- display/hal/default_standard/BUILD.gn | 6 +++--- display/hdi_service/device/src/proxy/BUILD.gn | 2 +- display/hdi_service/device/src/server/BUILD.gn | 2 +- display/hdi_service/gralloc/client/BUILD.gn | 6 +++--- display/hdi_service/gralloc/server/BUILD.gn | 2 +- display/hdi_service/video_layer/client/BUILD.gn | 2 +- display/hdi_service/video_layer/server/BUILD.gn | 2 +- .../test/fuzztest/displayallocmem_fuzzer/BUILD.gn | 2 +- .../displayissupportedalloc_fuzzer/BUILD.gn | 2 +- display/test/fuzztest/displaymmap_fuzzer/BUILD.gn | 2 +- display/test/unittest/standard/BUILD.gn | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/camera/bundle.json b/camera/bundle.json index c177d50421..af485d0a28 100644 --- a/camera/bundle.json +++ b/camera/bundle.json @@ -17,7 +17,7 @@ "hiviewdfx_hilog_native", "multimedia_camera_standard", "samgr_standard", - "display_device_driver", + "drivers_peripheral_display", "ipc", "utils_base" ], diff --git a/camera/hal/buffer_manager/BUILD.gn b/camera/hal/buffer_manager/BUILD.gn index 00d3204eaa..df177078e5 100644 --- a/camera/hal/buffer_manager/BUILD.gn +++ b/camera/hal/buffer_manager/BUILD.gn @@ -63,7 +63,7 @@ if (defined(ohos_lite)) { "//foundation/graphic/surface:surface", ] external_deps = [ - "display_device_driver:hdi_display", + "drivers_peripheral_display:hdi_display", "hdf_core:libhdf_utils", ] @@ -141,7 +141,7 @@ if (defined(ohos_lite)) { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_display_gralloc", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_chipsetsdk:surface", "hdf_core:libhdf_utils", "hiviewdfx_hilog_native:libhilog", diff --git a/camera/hal/init/BUILD.gn b/camera/hal/init/BUILD.gn index 208b3bd274..e08df00d9d 100644 --- a/camera/hal/init/BUILD.gn +++ b/camera/hal/init/BUILD.gn @@ -147,7 +147,7 @@ if (defined(ohos_lite)) { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_display_gralloc", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", diff --git a/camera/hal/test/fuzz/BUILD.gn b/camera/hal/test/fuzz/BUILD.gn index 4410a3b582..dcfef7c8ca 100644 --- a/camera/hal/test/fuzz/BUILD.gn +++ b/camera/hal/test/fuzz/BUILD.gn @@ -78,7 +78,7 @@ ohos_fuzztest("CameraIpcCameraDeviceRemoteFuzzTest") { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_display_gralloc", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", @@ -158,7 +158,7 @@ ohos_fuzztest("CameraIpcCameraHostServiceFuzzTest") { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_display_gralloc", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", @@ -238,7 +238,7 @@ ohos_fuzztest("CameraIpcOfflineFuzzTest") { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_display_gralloc", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", @@ -317,7 +317,7 @@ ohos_fuzztest("CameraIpcStreamOperatorFuzzTest") { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_display_gralloc", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", @@ -399,7 +399,7 @@ ohos_fuzztest("CameraIpcCameraDeviceCallbackFuzzTest") { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_display_gralloc", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", @@ -479,7 +479,7 @@ ohos_fuzztest("CameraIpcCameraHostCallbackFuzzTest") { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_display_gralloc", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", @@ -559,7 +559,7 @@ ohos_fuzztest("CameraIpcStreamOperatorCallbackFuzzTest") { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_display_gralloc", + "drivers_peripheral_display:hdi_display_gralloc", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", diff --git a/codec/test/demo/v2.0/BUILD.gn b/codec/test/demo/v2.0/BUILD.gn index 5c4e26d602..b5ea6113f1 100644 --- a/codec/test/demo/v2.0/BUILD.gn +++ b/codec/test/demo/v2.0/BUILD.gn @@ -43,7 +43,7 @@ ohos_executable("codec_hdi_omx_decode") { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_gralloc_client", + "drivers_peripheral_display:hdi_gralloc_client", "graphic_chipsetsdk:buffer_handle", "hiviewdfx_hilog_native:libhilog", ] @@ -86,7 +86,7 @@ ohos_executable("codec_hdi_omx_encode") { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_gralloc_client", + "drivers_peripheral_display:hdi_gralloc_client", "graphic_chipsetsdk:buffer_handle", "hiviewdfx_hilog_native:libhilog", ] diff --git a/codec/test/unittest/hdi_omx/BUILD.gn b/codec/test/unittest/hdi_omx/BUILD.gn index 417d7abbfa..96fa44c236 100644 --- a/codec/test/unittest/hdi_omx/BUILD.gn +++ b/codec/test/unittest/hdi_omx/BUILD.gn @@ -42,7 +42,7 @@ ohos_unittest("codec_hdi_omx_test") { if (is_standard_system) { external_deps = [ - "display_device_driver:hdi_gralloc_client", + "drivers_peripheral_display:hdi_gralloc_client", "graphic_chipsetsdk:buffer_handle", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", diff --git a/display/bundle.json b/display/bundle.json index f59a979e28..1097e62881 100755 --- a/display/bundle.json +++ b/display/bundle.json @@ -1,10 +1,10 @@ { - "name": "display_device_driver", + "name": "drivers_peripheral_display", "description": "display device driver", "version": "3.1", "license": "Apache License 2.0", "component": { - "name": "display_device_driver", + "name": "drivers_peripheral_display", "subsystem": "hdf", "syscap": [ "" ], "adapter_system_type": ["standard", "small"], diff --git a/display/hal/default_standard/BUILD.gn b/display/hal/default_standard/BUILD.gn index 98e8ea29fc..73f3409d55 100644 --- a/display/hal/default_standard/BUILD.gn +++ b/display/hal/default_standard/BUILD.gn @@ -53,7 +53,7 @@ ohos_shared_library("def_display_gralloc") { install_enable = true install_images = [ chipset_base_dir ] subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } config("def_display_device_pub_config") { @@ -125,7 +125,7 @@ ohos_shared_library("def_display_device") { install_enable = true install_images = [ chipset_base_dir ] subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } ohos_shared_library("def_display_layer_video") { @@ -155,5 +155,5 @@ ohos_shared_library("def_display_layer_video") { install_enable = true install_images = [ chipset_base_dir ] subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } diff --git a/display/hdi_service/device/src/proxy/BUILD.gn b/display/hdi_service/device/src/proxy/BUILD.gn index dcea285953..f10c7d4bbd 100644 --- a/display/hdi_service/device/src/proxy/BUILD.gn +++ b/display/hdi_service/device/src/proxy/BUILD.gn @@ -51,7 +51,7 @@ ohos_shared_library("libdisplay_device_proxy") { install_images = [ chipset_base_dir ] install_enable = true subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } group("display_device_proxy") { diff --git a/display/hdi_service/device/src/server/BUILD.gn b/display/hdi_service/device/src/server/BUILD.gn index d5920f58f6..af18dd7029 100644 --- a/display/hdi_service/device/src/server/BUILD.gn +++ b/display/hdi_service/device/src/server/BUILD.gn @@ -61,5 +61,5 @@ ohos_shared_library("libdisplay_device_server") { install_images = [ chipset_base_dir ] install_enable = true subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } diff --git a/display/hdi_service/gralloc/client/BUILD.gn b/display/hdi_service/gralloc/client/BUILD.gn index 8e9edacee7..d5b0b04310 100644 --- a/display/hdi_service/gralloc/client/BUILD.gn +++ b/display/hdi_service/gralloc/client/BUILD.gn @@ -68,7 +68,7 @@ if (defined(ohos_lite)) { } install_images = [ chipset_base_dir ] subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } ohos_shared_library("libhdi_display_gralloc_proxy") { @@ -95,7 +95,7 @@ if (defined(ohos_lite)) { external_deps += [ "graphic_chipsetsdk:buffer_handle" ] install_images = [ chipset_base_dir ] subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } ohos_shared_library("libhdi_mapper_adapter") { @@ -117,6 +117,6 @@ if (defined(ohos_lite)) { } install_images = [ chipset_base_dir ] subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } } diff --git a/display/hdi_service/gralloc/server/BUILD.gn b/display/hdi_service/gralloc/server/BUILD.gn index 69061f45b9..f790e5094c 100644 --- a/display/hdi_service/gralloc/server/BUILD.gn +++ b/display/hdi_service/gralloc/server/BUILD.gn @@ -50,5 +50,5 @@ ohos_shared_library("libhdi_display_gralloc_stub") { # install_enable = true install_images = [ chipset_base_dir ] subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } diff --git a/display/hdi_service/video_layer/client/BUILD.gn b/display/hdi_service/video_layer/client/BUILD.gn index e6244a2163..a616d9b705 100644 --- a/display/hdi_service/video_layer/client/BUILD.gn +++ b/display/hdi_service/video_layer/client/BUILD.gn @@ -54,6 +54,6 @@ if (is_standard_system) { install_images = [ chipset_base_dir ] subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } } diff --git a/display/hdi_service/video_layer/server/BUILD.gn b/display/hdi_service/video_layer/server/BUILD.gn index 018c7e2013..4298c04d8c 100644 --- a/display/hdi_service/video_layer/server/BUILD.gn +++ b/display/hdi_service/video_layer/server/BUILD.gn @@ -55,6 +55,6 @@ if (is_standard_system) { install_images = [ chipset_base_dir ] subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } } diff --git a/display/test/fuzztest/displayallocmem_fuzzer/BUILD.gn b/display/test/fuzztest/displayallocmem_fuzzer/BUILD.gn index 0316d7cc8a..0c16e3db89 100644 --- a/display/test/fuzztest/displayallocmem_fuzzer/BUILD.gn +++ b/display/test/fuzztest/displayallocmem_fuzzer/BUILD.gn @@ -38,7 +38,7 @@ ohos_fuzztest("DisplayAllocMemFuzzTest") { ] external_deps = [ - "display_device_driver:hdi_gralloc_client", + "drivers_peripheral_display:hdi_gralloc_client", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", diff --git a/display/test/fuzztest/displayissupportedalloc_fuzzer/BUILD.gn b/display/test/fuzztest/displayissupportedalloc_fuzzer/BUILD.gn index b34beae5f1..f0e6cf5fca 100644 --- a/display/test/fuzztest/displayissupportedalloc_fuzzer/BUILD.gn +++ b/display/test/fuzztest/displayissupportedalloc_fuzzer/BUILD.gn @@ -37,7 +37,7 @@ ohos_fuzztest("DisplayIssupportedAllocFuzzTest") { ] external_deps = [ - "display_device_driver:hdi_gralloc_client", + "drivers_peripheral_display:hdi_gralloc_client", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", diff --git a/display/test/fuzztest/displaymmap_fuzzer/BUILD.gn b/display/test/fuzztest/displaymmap_fuzzer/BUILD.gn index 39db2556a8..beea1adda6 100644 --- a/display/test/fuzztest/displaymmap_fuzzer/BUILD.gn +++ b/display/test/fuzztest/displaymmap_fuzzer/BUILD.gn @@ -38,7 +38,7 @@ ohos_fuzztest("DisplayMmapFuzzTest") { ] external_deps = [ - "display_device_driver:hdi_gralloc_client", + "drivers_peripheral_display:hdi_gralloc_client", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", diff --git a/display/test/unittest/standard/BUILD.gn b/display/test/unittest/standard/BUILD.gn index 6d6df4545d..e9350e323d 100644 --- a/display/test/unittest/standard/BUILD.gn +++ b/display/test/unittest/standard/BUILD.gn @@ -46,7 +46,7 @@ ohos_static_library("disp_hdi_test_common") { "utils_base:utils", ] subsystem_name = "hdf" - part_name = "display_device_driver" + part_name = "drivers_peripheral_display" } ohos_unittest("gralloctest") { -- Gitee