From 96e92b4ffe51e521173d800920aef9698e3dfce8 Mon Sep 17 00:00:00 2001 From: yuanbo Date: Wed, 15 Jun 2022 19:46:59 +0800 Subject: [PATCH] feat: normalize drivers framework component and repos Signed-off-by: yuanbo --- camera_hdf/hdi_impl/BUILD.gn | 6 +++--- camera_hdf/hdi_impl/test/BUILD.gn | 2 +- camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn | 4 ++-- distributedcamera.gni | 2 +- services/cameraservice/base/test/unittest/BUILD.gn | 6 ++---- .../cameraoperator/client/test/unittest/BUILD.gn | 6 ++---- .../cameraoperator/handler/test/unittest/BUILD.gn | 6 ++---- services/cameraservice/sinkservice/test/unittest/BUILD.gn | 2 +- services/cameraservice/sourceservice/BUILD.gn | 4 ++-- services/cameraservice/sourceservice/test/unittest/BUILD.gn | 6 ++---- 10 files changed, 18 insertions(+), 26 deletions(-) diff --git a/camera_hdf/hdi_impl/BUILD.gn b/camera_hdf/hdi_impl/BUILD.gn index 1e610384..6b8aa356 100644 --- a/camera_hdf/hdi_impl/BUILD.gn +++ b/camera_hdf/hdi_impl/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/adapter/uhdf2/uhdf.gni") +import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") @@ -68,7 +68,7 @@ ohos_shared_library("distributed_camera_hdf") { public_deps = [ "//drivers/interface/distributed_camera/v1_0:libdistributed_camera_provider_stub_1.0" ] deps = [ - "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", + "//drivers/hdf_core/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", @@ -81,9 +81,9 @@ ohos_shared_library("distributed_camera_hdf") { ] external_deps = [ - "device_driver_framework:libhdf_utils", "graphic_chipsetsdk:buffer_handle", "graphic_chipsetsdk:surface", + "hdf_core:libhdf_utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_single", "utils_base:utils", diff --git a/camera_hdf/hdi_impl/test/BUILD.gn b/camera_hdf/hdi_impl/test/BUILD.gn index bcd3bb3a..b56508c0 100644 --- a/camera_hdf/hdi_impl/test/BUILD.gn +++ b/camera_hdf/hdi_impl/test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/adapter/uhdf2/uhdf.gni") +import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") diff --git a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn index a07590ab..dd05a4b0 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/adapter/uhdf2/uhdf.gni") +import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") @@ -57,9 +57,9 @@ ohos_shared_library("distributed_camera_host_config") { ] external_deps = [ - "device_driver_framework:libhdf_host", "graphic_chipsetsdk:buffer_handle", "graphic_chipsetsdk:surface", + "hdf_core:libhdf_host", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_single", ] diff --git a/distributedcamera.gni b/distributedcamera.gni index c6823691..85772e5d 100644 --- a/distributedcamera.gni +++ b/distributedcamera.gni @@ -16,7 +16,7 @@ distributedcamera_path = "//foundation/distributedhardware/distributed_camera" distributedhardwarefwk_path = "//foundation/distributedhardware/distributed_hardware_fwk" -hdf_framework_path = "//drivers/framework" +hdf_framework_path = "//drivers/hdf_core/framework" camera_hdf_path = "//drivers/peripheral" diff --git a/services/cameraservice/base/test/unittest/BUILD.gn b/services/cameraservice/base/test/unittest/BUILD.gn index a92ba40f..9015584d 100644 --- a/services/cameraservice/base/test/unittest/BUILD.gn +++ b/services/cameraservice/base/test/unittest/BUILD.gn @@ -13,7 +13,5 @@ group("services_base_test") { testonly = true - deps = [ - "common/dcameraprotocol:dcamera_protocol_test", - ] -} \ No newline at end of file + deps = [ "common/dcameraprotocol:dcamera_protocol_test" ] +} diff --git a/services/cameraservice/cameraoperator/client/test/unittest/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/BUILD.gn index 11aa5aca..54f21488 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/BUILD.gn @@ -13,7 +13,5 @@ group("camera_client_test") { testonly = true - deps = [ - "common/cameraoperator:dcamera_client_test", - ] -} \ No newline at end of file + deps = [ "common/cameraoperator:dcamera_client_test" ] +} diff --git a/services/cameraservice/cameraoperator/handler/test/unittest/BUILD.gn b/services/cameraservice/cameraoperator/handler/test/unittest/BUILD.gn index 0cdc5b07..28cb07a2 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/test/unittest/BUILD.gn @@ -13,7 +13,5 @@ group("camera_handler_test") { testonly = true - deps = [ - "common/dcamerahandler:dcamera_handler_test", - ] -} \ No newline at end of file + deps = [ "common/dcamerahandler:dcamera_handler_test" ] +} diff --git a/services/cameraservice/sinkservice/test/unittest/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/BUILD.gn index 5f701090..9404116f 100644 --- a/services/cameraservice/sinkservice/test/unittest/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/BUILD.gn @@ -17,4 +17,4 @@ group("sink_service_test") { "common/distributedcamera:dcamera_sink_test", "common/distributedcameramgr:dcamera_sink_mgr_test", ] -} \ No newline at end of file +} diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index 6b004b08..28629bc7 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -101,10 +101,10 @@ ohos_shared_library("distributed_camera_source") { ] external_deps = [ - "device_driver_framework:libhdf_utils", - "device_driver_framework:libhdi", "distributed_camera_device_driver_interface:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", + "hdf_core:libhdf_utils", + "hdf_core:libhdi", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/cameraservice/sourceservice/test/unittest/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/BUILD.gn index b4ed56ba..6194e64f 100644 --- a/services/cameraservice/sourceservice/test/unittest/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/BUILD.gn @@ -13,7 +13,5 @@ group("source_service_test") { testonly = true - deps = [ - "common/distributedcameramgr:dcamera_mgr_test", - ] -} \ No newline at end of file + deps = [ "common/distributedcameramgr:dcamera_mgr_test" ] +} -- Gitee