Chang camera path

Signed-off-by: zwx981672 <zhangxiaofei37@huawei.com>
Change-Id: If852ef0a4c28bdb446ad0d68c366a620994e6ed7
This commit is contained in:
zwx981672 2023-05-10 15:07:46 +08:00
parent db0f469dac
commit b276a1e2b9
5 changed files with 47 additions and 50 deletions

View File

@ -17,7 +17,7 @@ import("../../../../tools/build/suite.gni")
import("//build/ohos.gni")
import("//build/test.gni")
import("$base_root/drivers/peripheral/camera/hal/camera.gni")
import("$base_root/drivers/peripheral/camera/camera.gni")
module_output_path = "hats/camera"
ohos_moduletest_suite("HatsHdfCamerabenchmarkTest") {
@ -33,7 +33,7 @@ ohos_moduletest_suite("HatsHdfCamerabenchmarkTest") {
"$base_root/system/core/include/cutils",
"//third_party/googletest/googletest/include",
"$base_root/drivers/peripheral/camera/interfaces/include",
"$base_root/drivers/peripheral/camera/hal/include",
"$base_root/drivers/peripheral/camera/vdi_base/common/include",
]
deps = [
"//third_party/benchmark",

View File

@ -16,7 +16,7 @@ import("//test/xts/tools/build/suite.gni")
import("//build/ohos.gni")
import("//build/test.gni")
import("//drivers/peripheral/camera/hal/camera.gni")
import("//drivers/peripheral/camera/camera.gni")
module_output_path = "hats/camera"
@ -35,13 +35,13 @@ ohos_moduletest_suite("HatsHdfCameraBufferTest") {
# camera common includes
"$camera_path/include",
"$camera_path/../interfaces/include",
"$camera_path/../interfaces/hdi_ipc",
"$camera_path/../../interfaces/include",
"$camera_path/../../interfaces/hdi_ipc",
"$camera_path/utils/event",
"$camera_path/../interfaces/hdi_ipc/utils/include",
"$camera_path/../interfaces/hdi_ipc/callback/host/include",
"$camera_path/../interfaces/hdi_ipc/callback/device/include",
"$camera_path/../interfaces/hdi_ipc/callback/operator/include",
"$camera_path/../../interfaces/hdi_ipc/utils/include",
"$camera_path/../../interfaces/hdi_ipc/callback/host/include",
"$camera_path/../../interfaces/hdi_ipc/callback/device/include",
"$camera_path/../../interfaces/hdi_ipc/callback/operator/include",
# device manager includes
"$camera_path/device_manager/include",
@ -51,19 +51,19 @@ ohos_moduletest_suite("HatsHdfCameraBufferTest") {
"$camera_path/buffer_manager/src/buffer_adapter/standard",
# hdi impl includes
"$camera_path/hdi_impl",
"$camera_path/hdi_impl/include",
"$camera_path/hdi_impl/include/camera_host",
"$camera_path/hdi_impl/include/camera_device",
"$camera_path/hdi_impl/include/stream_operator",
"$camera_path/hdi_impl/include/offline_stream_operator",
"$camera_path/hdi_impl/src/stream_operator/stream_tunnel/standard",
"$camera_path/../v4l2",
"$camera_path/../v4l2/include",
"$camera_path/../v4l2/include/camera_host",
"$camera_path/../v4l2/include/camera_device",
"$camera_path/../v4l2/include/stream_operator",
"$camera_path/../v4l2/include/offline_stream_operator",
"$camera_path/../v4l2/src/stream_operator/stream_tunnel/standard",
]
deps = [
"$camera_path/../v4l2:camera_host_service_1.0_static",
"$camera_path/buffer_manager:camera_buffer_manager",
"$camera_path/device_manager:camera_device_manager",
"$camera_path/hdi_impl:camera_host_service_1.0_static",
"$camera_path/pipeline_core:camera_pipeline_core",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest",

View File

@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//build/ohos_var.gni")
import("//build/test.gni")
import("//drivers/peripheral/camera/hal/camera.gni")
import("//drivers/peripheral/camera/camera.gni")
import("//test/xts/tools/build/suite.gni")
module_output_path = "hats/camera"
@ -35,20 +35,20 @@ ohos_moduletest_suite("HatsHdfCameraPipelineTest") {
include_dirs = [
"//third_party/googletest/googletest/include/gtest",
"$camera_path/../interfaces/include",
"$camera_path/../interfaces/hdi_ipc",
"$camera_path/../interfaces/hdi_ipc/utils/include",
"$camera_path/../interfaces/hdi_ipc/callback/host/include",
"$camera_path/../interfaces/hdi_ipc/callback/device/include",
"$camera_path/../interfaces/hdi_ipc/callback/operator/include",
"$camera_path/../../interfaces/include",
"$camera_path/../../interfaces/hdi_ipc",
"$camera_path/../../interfaces/hdi_ipc/utils/include",
"$camera_path/../../interfaces/hdi_ipc/callback/host/include",
"$camera_path/../../interfaces/hdi_ipc/callback/device/include",
"$camera_path/../../interfaces/hdi_ipc/callback/operator/include",
"$camera_path/include",
"$camera_path/hdi_impl",
"$camera_path/hdi_impl/include",
"$camera_path/hdi_impl/include/camera_host",
"$camera_path/hdi_impl/include/camera_device",
"$camera_path/hdi_impl/include/stream_operator",
"$camera_path/hdi_impl/include/offline_stream_operator",
"$camera_path/hdi_impl/src/stream_operator/stream_tunnel/standard",
"$camera_path/../v4l2",
"$camera_path/../v4l2/include",
"$camera_path/../v4l2/include/camera_host",
"$camera_path/../v4l2/include/camera_device",
"$camera_path/../v4l2/include/stream_operator",
"$camera_path/../v4l2/include/offline_stream_operator",
"$camera_path/../v4l2/src/stream_operator/stream_tunnel/standard",
"$camera_path/device_manager/include/",
"$camera_path/device_manager/include/v4l2",
"$camera_path/utils/event",
@ -71,9 +71,9 @@ ohos_moduletest_suite("HatsHdfCameraPipelineTest") {
]
deps = [
"$camera_path/../v4l2:camera_host_service_1.0_static",
"$camera_path/buffer_manager:camera_buffer_manager",
"$camera_path/device_manager:camera_device_manager",
"$camera_path/hdi_impl:camera_host_service_1.0_static",
"$camera_path/pipeline_core:camera_pipeline_core",
"//third_party/googletest:gmock",
"//third_party/googletest:gmock_main",

View File

@ -16,7 +16,7 @@ import("//test/xts/tools/build/suite.gni")
import("//build/ohos.gni")
import("//build/test.gni")
import("//drivers/peripheral/camera/hal/camera.gni")
import("//drivers/peripheral/camera/camera.gni")
module_output_path = "hats/camera"
@ -44,18 +44,18 @@ ohos_moduletest_suite("HatsHdfCameraTest") {
include_dirs = [
"//third_party/googletest/googletest/include/gtest",
"./include",
"$camera_path/../interfaces/include",
"$camera_path/../interfaces/hdi_ipc",
"$camera_path/../interfaces/hdi_ipc/utils/include",
"$camera_path/test/common/callback/include",
"$camera_path/../../interfaces/include",
"$camera_path/../../interfaces/hdi_ipc",
"$camera_path/../../interfaces/hdi_ipc/utils/include",
"$camera_path/../../test/common/callback/include",
"$camera_path/include",
"$camera_path/hdi_impl",
"$camera_path/hdi_impl/include",
"$camera_path/hdi_impl/include/camera_host",
"$camera_path/hdi_impl/include/camera_device",
"$camera_path/hdi_impl/include/stream_operator",
"$camera_path/hdi_impl/include/offline_stream_operator",
"$camera_path/hdi_impl/src/stream_operator/stream_tunnel/standard",
"$camera_path/../v4l2",
"$camera_path/../v4l2/include",
"$camera_path/../v4l2/include/camera_host",
"$camera_path/../v4l2/include/camera_device",
"$camera_path/../v4l2/include/stream_operator",
"$camera_path/../v4l2/include/offline_stream_operator",
"$camera_path/../v4l2/src/stream_operator/stream_tunnel/standard",
"$camera_path/device_manager/include/",
"$camera_path/device_manager/include/v4l2",
"$camera_path/utils/event",
@ -78,9 +78,9 @@ ohos_moduletest_suite("HatsHdfCameraTest") {
]
deps = [
"$camera_path/../v4l2:camera_host_service_1.0_static",
"$camera_path/buffer_manager:camera_buffer_manager",
"$camera_path/device_manager:camera_device_manager",
"$camera_path/hdi_impl:camera_host_service_1.0_static",
"$camera_path/pipeline_core:camera_pipeline_core",
"//third_party/googletest:gmock",
"//third_party/googletest:gmock_main",

View File

@ -16,7 +16,7 @@ import("//build/ohos.gni")
import("//build/ohos_var.gni")
import("//build/test.gni")
import("//test/xts/tools/build/suite.gni")
import("$base_root/drivers/peripheral/camera/hal/camera.gni")
import("$base_root/drivers/peripheral/camera/camera.gni")
module_output_path = "hats/camera"
#config("cameraTest_config") {
@ -70,10 +70,7 @@ config("hdf_cameramg") {
# common includes
"./include",
"//third_party/googletest/googletest/include",
"$camera_path/../interfaces/include",
"$camera_path/../../interfaces/include",
"$camera_path/include",
#"$base_root/drivers/peripheral/camera/interfaces/include",
#"$base_root/drivers/peripheral/camera/hal/include",
]
}