modify redundancy dependency in camera module

Signed-off-by: jiazhenyu <jiazhenyu1@huawei.com>
This commit is contained in:
jiazhenyu
2022-09-15 21:54:48 +08:00
parent d900099aae
commit a2f7361780
7 changed files with 16 additions and 14 deletions
@@ -92,15 +92,13 @@ ohos_shared_library("camera_pipeline_core") {
if (is_standard_system) {
external_deps = [
"c_utils:utils",
"graphic_chipsetsdk:surface",
"hdf_core:libhdf_utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_single",
]
} else {
external_deps = [ "hilog:libhilog" ]
}
external_deps += [ "ipc:ipc_single" ]
external_deps += []
public_configs = [ ":pipe_config" ]
install_images = [ chipset_base_dir ]
@@ -36,12 +36,13 @@ ohos_shared_library("camera_v4l2_adapter") {
"$camera_path/include",
"//drivers/peripheral/camera/hal/adapter/platform/v4l2/src/driver_adapter/include",
"//drivers/peripheral/camera/interfaces/metadata/include",
"//drivers/hdf_core/framework/include/utils",
"//drivers/hdf_core/adapter/uhdf2/osal/include",
]
if (is_standard_system) {
external_deps = [
"c_utils:utils",
"hdf_core:libhdf_utils",
"hiviewdfx_hilog_native:libhilog",
]
} else {
@@ -29,11 +29,12 @@ ohos_executable("v4l2_main") {
"$board_camera_path/driver_adapter/test/v4l2_test/include",
"$camera_path/include",
"//drivers/peripheral/camera/hal/adapter/platform/v4l2/src/driver_adapter/include",
"//drivers/hdf_core/framework/include/utils",
"//drivers/hdf_core/adapter/uhdf2/osal/include",
]
external_deps = [
"c_utils:utils",
"hdf_core:libhdf_utils",
"hiviewdfx_hilog_native:libhilog",
]
defines += [ "V4L2_MAIN_TEST" ]
+5 -5
View File
@@ -38,6 +38,8 @@ if (defined(ohos_lite)) {
"//base/hiviewdfx/interfaces/innerkits/libhilog/include",
"//drivers/peripheral/display/interfaces/include",
"//drivers/peripheral/base",
"//drivers/hdf_core/framework/include/utils",
"//drivers/hdf_core/adapter/uhdf2/osal/include",
]
libs = []
@@ -46,10 +48,7 @@ if (defined(ohos_lite)) {
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//foundation/graphic/surface:surface",
]
external_deps = [
"drivers_peripheral_display:hdi_display",
"hdf_core:libhdf_utils",
]
external_deps = [ "drivers_peripheral_display:hdi_display" ]
public_configs = [ ":buffer_manager_config" ]
subsystem_name = "hdf"
@@ -97,6 +96,8 @@ if (defined(ohos_lite)) {
"src/buffer_adapter/standard",
"$camera_path/include",
"//drivers/peripheral/camera/interfaces/metadata/include",
"//drivers/hdf_core/framework/include/utils",
"//drivers/hdf_core/adapter/uhdf2/osal/include",
]
libs = []
@@ -112,7 +113,6 @@ if (defined(ohos_lite)) {
"c_utils:utils",
"drivers_peripheral_display:hdi_display_gralloc",
"graphic_chipsetsdk:surface",
"hdf_core:libhdf_utils",
"hiviewdfx_hilog_native:libhilog",
]
} else {
-1
View File
@@ -200,7 +200,6 @@ if (defined(ohos_lite)) {
external_deps = [
"c_utils:utils",
"graphic_chipsetsdk:surface",
"hdf_core:libhdf_host",
"hdf_core:libhdf_ipc_adapter",
"hdf_core:libhdf_utils",
"hdf_core:libhdi",
+2 -1
View File
@@ -46,6 +46,8 @@ if (defined(ohos_lite)) {
"//third_party/libexif",
"watchdog",
"exif",
"//drivers/hdf_core/framework/include/utils",
"//drivers/hdf_core/adapter/uhdf2/osal/include",
]
libs = []
defines = []
@@ -53,7 +55,6 @@ if (defined(ohos_lite)) {
external_deps = [
"c_utils:utils",
"hdf_core:libhdf_utils",
"hiviewdfx_hilog_native:libhilog",
]
if (enable_camera_device_utest) {
+4 -2
View File
@@ -20,7 +20,10 @@ ohos_shared_library("metadata") {
"-Wall",
]
cflags_cc = cflags
include_dirs = [ "//drivers/peripheral/camera/interfaces/metadata/include" ]
include_dirs = [
"//drivers/peripheral/camera/interfaces/metadata/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
]
if (defined(ohos_lite)) {
sources = [
"src/camera_metadata_info.cpp",
@@ -36,7 +39,6 @@ ohos_shared_library("metadata") {
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_single",
]
}