mirror of
https://github.com/openharmony/device_board_kaihong.git
synced 2026-07-01 22:24:05 -04:00
!55 DFX部件名整改,hilog_native/hiviewdfx_hilog_native改为hilog,hitrace_native改为hitrace
Merge pull request !55 from shanghuanni/master
This commit is contained in:
@@ -212,11 +212,11 @@ ohos_shared_library("camera_host_vdi_impl_1.0") {
|
||||
"hdf_core:libhdf_ipc_adapter",
|
||||
"hdf_core:libhdf_utils",
|
||||
"hdf_core:libhdi",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
"ipc:ipc_single",
|
||||
]
|
||||
if (use_hitrace) {
|
||||
external_deps += [ "hitrace_native:libhitracechain" ]
|
||||
external_deps += [ "hitrace:libhitracechain" ]
|
||||
}
|
||||
} else {
|
||||
external_deps = [ "hilog:libhilog" ]
|
||||
@@ -224,7 +224,7 @@ ohos_shared_library("camera_host_vdi_impl_1.0") {
|
||||
external_deps += [
|
||||
"drivers_interface_camera:libcamera_stub_1.0",
|
||||
"drivers_interface_camera:metadata",
|
||||
"hitrace_native:hitrace_meter",
|
||||
"hitrace:hitrace_meter",
|
||||
"ipc:ipc_single",
|
||||
]
|
||||
public_configs = [ ":camhdi_impl_config" ]
|
||||
@@ -261,12 +261,12 @@ ohos_static_library("camera_host_vdi_impl_1.0_static") {
|
||||
"hdf_core:libhdf_ipc_adapter",
|
||||
"hdf_core:libhdf_utils",
|
||||
"hdf_core:libhdi",
|
||||
"hitrace_native:hitrace_meter",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
"hitrace:hitrace_meter",
|
||||
"ipc:ipc_single",
|
||||
]
|
||||
if (use_hitrace) {
|
||||
external_deps += [ "hitrace_native:libhitracechain" ]
|
||||
external_deps += [ "hitrace:libhitracechain" ]
|
||||
}
|
||||
} else {
|
||||
external_deps = [ "hilog:libhilog" ]
|
||||
@@ -274,7 +274,7 @@ ohos_static_library("camera_host_vdi_impl_1.0_static") {
|
||||
external_deps += [
|
||||
"drivers_interface_camera:libcamera_stub_1.0",
|
||||
"drivers_interface_camera:metadata",
|
||||
"hitrace_native:hitrace_meter",
|
||||
"hitrace:hitrace_meter",
|
||||
"ipc:ipc_single",
|
||||
]
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ ohos_executable("ohos_camera_demo") {
|
||||
"hdf_core:libhdf_ipc_adapter",
|
||||
"hdf_core:libhdf_utils",
|
||||
"hdf_core:libhdi",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
"samgr:samgr_proxy",
|
||||
]
|
||||
} else {
|
||||
|
||||
@@ -77,7 +77,7 @@ ohos_shared_library("camera_device_manager") {
|
||||
external_deps = [
|
||||
"c_utils:utils",
|
||||
"hdf_core:libhdf_utils",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
]
|
||||
} else {
|
||||
external_deps = [
|
||||
|
||||
@@ -53,7 +53,7 @@ ohos_unittest("camera_board_device_manager_unittest") {
|
||||
"c_utils:utils",
|
||||
"graphic_chipsetsdk:surface",
|
||||
"hdf_core:libhdf_utils",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
]
|
||||
} else {
|
||||
external_deps = [ "hilog:libhilog" ]
|
||||
|
||||
@@ -54,7 +54,7 @@ ohos_shared_library("camera_v4l2_adapter") {
|
||||
external_deps = [
|
||||
"c_utils:utils",
|
||||
"hdf_core:libhdf_utils",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
]
|
||||
} else {
|
||||
external_deps = [ "hilog:libhilog" ]
|
||||
|
||||
@@ -74,7 +74,7 @@ ohos_unittest("v4l2_adapter_unittest") {
|
||||
external_deps = [
|
||||
"c_utils:utils",
|
||||
"hdf_core:libhdf_utils",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
]
|
||||
} else {
|
||||
external_deps = [
|
||||
|
||||
@@ -48,7 +48,7 @@ ohos_executable("v4l2_main") {
|
||||
"c_utils:utils",
|
||||
"drivers_interface_camera:metadata",
|
||||
"hdf_core:libhdf_utils",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
]
|
||||
defines += [ "V4L2_MAIN_TEST" ]
|
||||
|
||||
|
||||
@@ -55,11 +55,11 @@ if (!defined(ohos_lite)) {
|
||||
"hdf_core:libhdf_ipc_adapter",
|
||||
"hdf_core:libhdf_utils",
|
||||
"hdf_core:libhdi",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
"ipc:ipc_single",
|
||||
]
|
||||
if (use_hitrace) {
|
||||
external_deps += [ "hitrace_native:libhitrace" ]
|
||||
external_deps += [ "hitrace:libhitrace" ]
|
||||
}
|
||||
} else {
|
||||
external_deps = [ "hilog:libhilog" ]
|
||||
|
||||
@@ -143,7 +143,7 @@ ohos_shared_library("camera_pipeline_core") {
|
||||
if (is_standard_system) {
|
||||
external_deps = [
|
||||
"hdf_core:libhdf_utils",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
]
|
||||
} else {
|
||||
external_deps = [ "hilog:libhilog" ]
|
||||
|
||||
@@ -92,7 +92,7 @@ ohos_unittest("camera_pipeline_core_test_ut") {
|
||||
"drivers_interface_camera:libcamera_stub_1.0",
|
||||
"graphic_chipsetsdk:surface",
|
||||
"hdf_core:libhdf_utils",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
"samgr:samgr_proxy",
|
||||
]
|
||||
} else {
|
||||
|
||||
@@ -71,7 +71,7 @@ ohos_shared_library("libbt_vendor") {
|
||||
|
||||
external_deps = [
|
||||
"c_utils:utils",
|
||||
"hiviewdfx_hilog_native:libhilog",
|
||||
"hilog:libhilog",
|
||||
]
|
||||
|
||||
install_enable = true
|
||||
|
||||
Reference in New Issue
Block a user