hats仓部件整改

Signed-off-by: lixiaofeng_154b <lixiaofeng54@huawei.com>
Change-Id: I118d005443e40c31b061f3a950361920ff7d39e8
This commit is contained in:
lixiaofeng_154b 2023-05-05 17:16:53 +08:00
parent a2293c58d6
commit e4b1780dcd
43 changed files with 72 additions and 139 deletions

View File

@ -17,10 +17,13 @@ import("//test/xts/tools/build/suite.gni")
group("HatsHdfNnrtTest") {
testonly = true
if (xts_hats_features_nnrt == false) {
if (xts_hats_features_rich == false) {
if (is_standard_system) {
if (xts_hats_features_nnrt) {
deps = [ "hdi:hdi" ]
deps = [
"hdi/v1_0:hdi",
"hdi/v2_0:hdi",
]
}
}
}

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -23,7 +23,7 @@ group("HatsHdfAudioTest") {
testonly = true
}
if (is_standard_system) {
if (xts_hats_features_nnrt == false) {
if (xts_hats_features_rich == false) {
deps = [ "idl:hdi_base_common" ]
} else {
deps = [

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -22,7 +22,7 @@ group("HatsHdfCameraTest") {
testonly = true
}
if (is_standard_system) {
if (xts_hats_features_nnrt == false) {
if (xts_hats_features_rich == false) {
deps = [
"cameraHdi:HatsHdfCameraHdiTest",
"cameraMg:HatsHdfCameraMgTest",

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 - 2023 Huawei Device Co., Ltd.
# Copyright (c) 2022-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -11,101 +11,39 @@
# See the License for the specific language governing permissions and
# limitations under the License.
base_root = "../../../../../../"
import("//build/ohos_var.gni")
import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
import("//drivers/peripheral/audio/audio.gni")
import("//test/xts/tools/build/suite.gni")
import("../../../../tools/build/suite.gni")
import("//build/ohos.gni")
import("//build/test.gni")
import("//drivers/peripheral/camera/hal/camera.gni")
import("$base_root/drivers/peripheral/camera/hal/camera.gni")
module_output_path = "hats/camera"
config("cameraTest_config") {
visibility = [ ":*" ]
}
ohos_moduletest_suite("HatsHdfCamerabenchmarkTest") {
testonly = true
module_out_path = module_output_path
sources = [
"../v4l2/src/stream_customer.cpp",
"../v4l2/src/test_display.cpp",
"../cameraMg/src/common.cpp",
"./hdf_camera_benchmark_test.cpp",
]
include_dirs = [
"//third_party/googletest/googletest/include/gtest",
# common includes
"./include",
"$camera_path/../interfaces/include",
"$camera_path/../interfaces/hdi_ipc",
"$camera_path/../interfaces/hdi_ipc/server/include",
"$camera_path/../interfaces/hdi_ipc/utils/include",
"$camera_path/../interfaces/hdi_ipc/client/include",
"$camera_path/test/common/callback/include",
"//foundation/graphic/graphic/frameworks/surface/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/device_manager/include/",
"$camera_path/device_manager/include/v4l2",
"//foundation/graphic/utils/interfaces/kits",
"//foundation/graphic/graphic/interfaces/kits",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic/utils/buffer_handle/export",
"//base/startup/syspara_lite/adapter/native/syspara/include",
"$camera_path/utils/event",
"//drivers/peripheral/display/interfaces/include",
"//drivers/peripheral/display/hdi_service/gralloc/include",
"//drivers/peripheral/base",
"//base/hiviewdfx/interfaces/innerkits/libhilog/include",
#producer
"//utils/native/base/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"$camera_path/pipeline_core/utils",
"$camera_path/pipeline_core/include",
"$camera_path/pipeline_core/host_stream/include",
"$camera_path/pipeline_core/nodes/include",
"$camera_path/pipeline_core/nodes/src/node_base",
"$camera_path/pipeline_core/nodes/src/dummy_node",
"$camera_path/pipeline_core/pipeline_impl/src/strategy/config",
"$camera_path/pipeline_core/pipeline_impl/include",
"$camera_path/pipeline_core/pipeline_impl/src",
"$camera_path/pipeline_core/pipeline_impl/src/builder",
"$camera_path/pipeline_core/pipeline_impl/src/dispatcher",
"$camera_path/pipeline_core/pipeline_impl/src/parser",
"$camera_path/pipeline_core/pipeline_impl/src/strategy",
"$camera_path/pipeline_core/ipp/include",
# hcs parser
"//system/core/include/cutils",
"$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",
]
deps = [
"$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",
"//drivers/interface/camera/v1_0:libcamera_proxy_1.0",
"//third_party/benchmark",
"//third_party/googletest:gmock",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest",
"//third_party/googletest:gtest_main",
]
if (is_standard_system) {
external_deps = [
"c_utils:utils",
"graphic_chipsetsdk:surface",
"hdf_core:libhdf_host",
"hdf_core:libhdf_ipc_adapter",
"hdf_core:libhdf_utils",
@ -118,19 +56,11 @@ ohos_moduletest_suite("HatsHdfCamerabenchmarkTest") {
}
external_deps += [
"drivers_interface_camera:libcamera_proxy_1.0",
"drivers_interface_camera:metadata",
"init:libbegetutil",
"ipc:ipc_single",
"samgr:samgr_proxy",
]
public_configs = [ ":cameraTest_config" ]
subsystem_name = "xts"
part_name = "xts_hats"
}
#group("hdi") {
# if (!defined(ohos_lite)) {
# testonly = true
# }
# deps = [ ":HatsHdfCamerabenchmarkTest" ]
#}

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022 - 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -18,7 +18,7 @@ import("$base_root/test/xts/hats/build.gni")
import("$base_root/test/xts/tools/build/suite.gni")
group("HatsHdfCodecTest") {
if (xts_hats_features_nnrt == false) {
if (xts_hats_features_rich == false) {
testonly = true
deps = [
#"benchmarktest:HatsHdfCodecBenchmarkTest",

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022 - 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -49,7 +49,7 @@ ohos_moduletest_suite("HatsHdfOmxCodecTest") {
}
defines = []
if (xts_hats_features_nnrt) {
if (xts_hats_features_rich) {
defines += [ "SUPPORT_OMX" ]
}
subsystem_name = "xts"
@ -69,7 +69,7 @@ config("hdf_codec_omx") {
"-fno-common",
"-fno-strict-aliasing",
]
if (xts_hats_features_nnrt == false) {
if (xts_hats_features_rich == false) {
cflags += [ "-DSUPPORT_OMX" ]
}
}

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -18,7 +18,7 @@ import("$base_root/test/xts/tools/build/suite.gni")
group("HatsHdfDisplayTest") {
testonly = true
if (xts_hats_features_nnrt == true) {
if (xts_hats_features_rich == true) {
deps = [
"buffer:HatsHdfDisplayBufferTest",
#"composer/death:HatsHdfDisplayComposerDeathTest",

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022 - 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022 - 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -18,7 +18,7 @@ import("$base_root/test/xts/tools/build/suite.gni")
group("HatsHdfInputTest") {
testonly = true
if (xts_hats_features_nnrt == true) {
if (xts_hats_features_rich == true) {
deps = [ "hdi_input:HatsHdfInputTest" ]
} else {
deps = [

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -18,7 +18,7 @@ import("//test/xts/tools/build/suite.gni")
group("HatsHdfLightTest") {
testonly = true
if (xts_hats_features_nnrt == true) {
if (xts_hats_features_rich == true) {
} else {
deps = [
#"liteos:HatsHdfLightHdiTest",

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -20,7 +20,7 @@ import("//test/xts/tools/build/suite.gni")
group("HatsHdfLocationTest") {
testonly = true
if (xts_hats_features_nnrt == false) {
if (xts_hats_features_rich == false) {
} else {
if (is_standard_system) {
deps = [

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -17,7 +17,7 @@ import("//test/xts/tools/build/suite.gni")
group("HatsHdfManagerTest") {
testonly = true
if (xts_hats_features_nnrt == true) {
if (xts_hats_features_rich == true) {
deps = [ "managerHdiTest:HatsHdfManagerHdiTest" ]
} else {
deps = [

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -17,7 +17,7 @@ import("//test/xts/tools/build/suite.gni")
group("HatsHdfMotionTest") {
testonly = true
if (xts_hats_features_nnrt == false) {
if (xts_hats_features_rich == false) {
} else {
if (is_standard_system) {
deps = [ "hdi:HatsHdfMotionTest" ]

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -20,7 +20,7 @@ import("//test/xts/tools/build/suite.gni")
group("HatsHdfNfcTest") {
testonly = true
if (xts_hats_features_nnrt == true) {
if (xts_hats_features_rich == true) {
if (is_standard_system) {
deps = [ "hdcService:HatsHdfNfcHdiTest" ]
}

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -18,7 +18,7 @@ import("//test/xts/tools/build/suite.gni")
group("HatsHdfVibratorTest") {
testonly = true
if (xts_hats_features_nnrt == true) {
if (xts_hats_features_rich == true) {
deps = [
#"hdi_adapter:HatsHdfVibratorAdapterTest"
]

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -18,7 +18,7 @@ import("//test/xts/tools/build/suite.gni")
group("HatsHdfVibratorAdapterTest") {
testonly = true
if (xts_hats_features_nnrt == true) {
if (xts_hats_features_rich == true) {
deps = [
"hdi_impl:HatsHdfVibratorImplTest",
"hdi_parse:HatsHdfVibratorParseTest",

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
# Copyright (c) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (C) 2021-2022 Huawei Device Co., Ltd.
# Copyright (C) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -19,7 +19,7 @@ import(
group("kernel") {
testonly = true
if (is_standard_system) {
if (xts_hats_features_nnrt == true) {
if (xts_hats_features_rich == true) {
deps = [
"accesstokenid:HatsAccesstokenidTest",
"dmabuffer:HatsDmaBufferTest",

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022 - 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022 - 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022 - 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

View File

@ -1,4 +1,4 @@
# Copyright (C) 2021-2022 Huawei Device Co., Ltd.
# Copyright (C) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -15,7 +15,7 @@ import("//test/xts/hats/build.gni")
group("startup") {
testonly = true
if (xts_hats_features_nnrt == true) {
if (xts_hats_features_rich == true) {
deps = [
#"partitionslot:HatsStartupPartitionSlotTest"
]

View File

@ -1,4 +1,4 @@
# Copyright (C) 2021-2022 Huawei Device Co., Ltd.
# Copyright (C) 2021-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -15,7 +15,7 @@ import("//test/xts/hats/build.gni")
group("useriam") {
testonly = true
if (is_standard_system) {
if (xts_hats_features_nnrt == false) {
if (xts_hats_features_rich == false) {
deps = [
"faceauth:HatsUserIamFaceAuthTest",
"fingerprintauth:HatsUserIamFingerprintAuthTest",