From e4b1780dcdc42194734d6743c3d7384db3add839 Mon Sep 17 00:00:00 2001 From: lixiaofeng_154b Date: Fri, 5 May 2023 17:16:53 +0800 Subject: [PATCH] =?UTF-8?q?hats=E4=BB=93=E9=83=A8=E4=BB=B6=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lixiaofeng_154b Change-Id: I118d005443e40c31b061f3a950361920ff7d39e8 --- ai/nnrt/BUILD.gn | 7 +- build.gni | 2 +- hdf/audio/BUILD.gn | 4 +- hdf/audio/idl/common/adapter/BUILD.gn | 2 +- hdf/audio/idl/common/capture/BUILD.gn | 2 +- hdf/audio/idl/common/manager/BUILD.gn | 2 +- hdf/audio/idl/common/render/BUILD.gn | 2 +- hdf/bluetooth/hdiService/BUILD.gn | 2 +- hdf/camera/BUILD.gn | 4 +- hdf/camera/cameraBenchmarkTest/BUILD.gn | 92 +++----------------- hdf/camera/cameraHdi/buffer_manager/BUILD.gn | 2 +- hdf/camera/cameraMg/BUILD.gn | 2 +- hdf/codec/BUILD.gn | 4 +- hdf/codec/hdi_adapter/BUILD.gn | 2 +- hdf/codec/hdi_omx/BUILD.gn | 6 +- hdf/codec/hdi_v1.0/BUILD.gn | 2 +- hdf/display/BUILD.gn | 4 +- hdf/display/buffer/death/BUILD.gn | 2 +- hdf/display/buffer/unittest/BUILD.gn | 2 +- hdf/input/BUILD.gn | 4 +- hdf/light/BUILD.gn | 4 +- hdf/light/liteos/BUILD.gn | 2 +- hdf/location/BUILD.gn | 4 +- hdf/location/agnss/BUILD.gn | 2 +- hdf/location/geofence/BUILD.gn | 2 +- hdf/location/gnss/BUILD.gn | 2 +- hdf/manager/BUILD.gn | 4 +- hdf/motion/BUILD.gn | 4 +- hdf/motion/hdi/BUILD.gn | 2 +- hdf/nfc/BUILD.gn | 4 +- hdf/nfc/hdcService/BUILD.gn | 2 +- hdf/sensor/common/BUILD.gn | 2 +- hdf/vibrator/BUILD.gn | 2 +- hdf/vibrator/common/BUILD.gn | 2 +- hdf/vibrator/hdi_adapter/BUILD.gn | 2 +- hdf/wlan/BUILD.gn | 2 +- hdf/wlan/wifi/BUILD.gn | 2 +- kernel/BUILD.gn | 4 +- powermgr/battery/hdi_battery/BUILD.gn | 2 +- powermgr/power/hdi_power/BUILD.gn | 2 +- powermgr/thermal/hdi_thermal/BUILD.gn | 2 +- startup/BUILD.gn | 4 +- useriam/BUILD.gn | 4 +- 43 files changed, 72 insertions(+), 139 deletions(-) diff --git a/ai/nnrt/BUILD.gn b/ai/nnrt/BUILD.gn index 554d5435..20c7b8d4 100644 --- a/ai/nnrt/BUILD.gn +++ b/ai/nnrt/BUILD.gn @@ -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", + ] } } } diff --git a/build.gni b/build.gni index ae31b9b2..3918bb6c 100644 --- a/build.gni +++ b/build.gni @@ -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 diff --git a/hdf/audio/BUILD.gn b/hdf/audio/BUILD.gn index 2ce15966..4e10b655 100644 --- a/hdf/audio/BUILD.gn +++ b/hdf/audio/BUILD.gn @@ -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 = [ diff --git a/hdf/audio/idl/common/adapter/BUILD.gn b/hdf/audio/idl/common/adapter/BUILD.gn index f5bcc676..c1755472 100644 --- a/hdf/audio/idl/common/adapter/BUILD.gn +++ b/hdf/audio/idl/common/adapter/BUILD.gn @@ -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 diff --git a/hdf/audio/idl/common/capture/BUILD.gn b/hdf/audio/idl/common/capture/BUILD.gn index b435a2d3..8c3a4ab5 100644 --- a/hdf/audio/idl/common/capture/BUILD.gn +++ b/hdf/audio/idl/common/capture/BUILD.gn @@ -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 diff --git a/hdf/audio/idl/common/manager/BUILD.gn b/hdf/audio/idl/common/manager/BUILD.gn index 1149bba4..9b7b3830 100644 --- a/hdf/audio/idl/common/manager/BUILD.gn +++ b/hdf/audio/idl/common/manager/BUILD.gn @@ -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 diff --git a/hdf/audio/idl/common/render/BUILD.gn b/hdf/audio/idl/common/render/BUILD.gn index 7aa57ae8..52b273ea 100644 --- a/hdf/audio/idl/common/render/BUILD.gn +++ b/hdf/audio/idl/common/render/BUILD.gn @@ -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 diff --git a/hdf/bluetooth/hdiService/BUILD.gn b/hdf/bluetooth/hdiService/BUILD.gn index 1092bf43..f6db8c58 100644 --- a/hdf/bluetooth/hdiService/BUILD.gn +++ b/hdf/bluetooth/hdiService/BUILD.gn @@ -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 diff --git a/hdf/camera/BUILD.gn b/hdf/camera/BUILD.gn index 7da82ce3..a5322afd 100644 --- a/hdf/camera/BUILD.gn +++ b/hdf/camera/BUILD.gn @@ -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", diff --git a/hdf/camera/cameraBenchmarkTest/BUILD.gn b/hdf/camera/cameraBenchmarkTest/BUILD.gn index 7dd363ae..aef07f14 100644 --- a/hdf/camera/cameraBenchmarkTest/BUILD.gn +++ b/hdf/camera/cameraBenchmarkTest/BUILD.gn @@ -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" ] -#} diff --git a/hdf/camera/cameraHdi/buffer_manager/BUILD.gn b/hdf/camera/cameraHdi/buffer_manager/BUILD.gn index 4869a857..efea84e1 100644 --- a/hdf/camera/cameraHdi/buffer_manager/BUILD.gn +++ b/hdf/camera/cameraHdi/buffer_manager/BUILD.gn @@ -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 diff --git a/hdf/camera/cameraMg/BUILD.gn b/hdf/camera/cameraMg/BUILD.gn index a47f150a..0652179e 100644 --- a/hdf/camera/cameraMg/BUILD.gn +++ b/hdf/camera/cameraMg/BUILD.gn @@ -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 diff --git a/hdf/codec/BUILD.gn b/hdf/codec/BUILD.gn index ea515fd5..be76b0ba 100644 --- a/hdf/codec/BUILD.gn +++ b/hdf/codec/BUILD.gn @@ -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", diff --git a/hdf/codec/hdi_adapter/BUILD.gn b/hdf/codec/hdi_adapter/BUILD.gn index bec149a5..bf7e1103 100644 --- a/hdf/codec/hdi_adapter/BUILD.gn +++ b/hdf/codec/hdi_adapter/BUILD.gn @@ -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 diff --git a/hdf/codec/hdi_omx/BUILD.gn b/hdf/codec/hdi_omx/BUILD.gn index 9b5232b8..7ae03ab8 100644 --- a/hdf/codec/hdi_omx/BUILD.gn +++ b/hdf/codec/hdi_omx/BUILD.gn @@ -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" ] } } diff --git a/hdf/codec/hdi_v1.0/BUILD.gn b/hdf/codec/hdi_v1.0/BUILD.gn index 1009114e..b7bb9cdf 100644 --- a/hdf/codec/hdi_v1.0/BUILD.gn +++ b/hdf/codec/hdi_v1.0/BUILD.gn @@ -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 diff --git a/hdf/display/BUILD.gn b/hdf/display/BUILD.gn index 02e53861..a04294df 100644 --- a/hdf/display/BUILD.gn +++ b/hdf/display/BUILD.gn @@ -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", diff --git a/hdf/display/buffer/death/BUILD.gn b/hdf/display/buffer/death/BUILD.gn index 5805cbb4..3b51cf3a 100644 --- a/hdf/display/buffer/death/BUILD.gn +++ b/hdf/display/buffer/death/BUILD.gn @@ -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 diff --git a/hdf/display/buffer/unittest/BUILD.gn b/hdf/display/buffer/unittest/BUILD.gn index a82c1313..3ef17124 100644 --- a/hdf/display/buffer/unittest/BUILD.gn +++ b/hdf/display/buffer/unittest/BUILD.gn @@ -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 diff --git a/hdf/input/BUILD.gn b/hdf/input/BUILD.gn index cbff4516..7dbec099 100644 --- a/hdf/input/BUILD.gn +++ b/hdf/input/BUILD.gn @@ -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 = [ diff --git a/hdf/light/BUILD.gn b/hdf/light/BUILD.gn index 195b5920..b73566e6 100644 --- a/hdf/light/BUILD.gn +++ b/hdf/light/BUILD.gn @@ -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", diff --git a/hdf/light/liteos/BUILD.gn b/hdf/light/liteos/BUILD.gn index 2e3e4a7c..70a383a5 100644 --- a/hdf/light/liteos/BUILD.gn +++ b/hdf/light/liteos/BUILD.gn @@ -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 diff --git a/hdf/location/BUILD.gn b/hdf/location/BUILD.gn index b6a89c22..e6106ec2 100644 --- a/hdf/location/BUILD.gn +++ b/hdf/location/BUILD.gn @@ -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 = [ diff --git a/hdf/location/agnss/BUILD.gn b/hdf/location/agnss/BUILD.gn index 44f0c865..ac4b5e3e 100644 --- a/hdf/location/agnss/BUILD.gn +++ b/hdf/location/agnss/BUILD.gn @@ -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 diff --git a/hdf/location/geofence/BUILD.gn b/hdf/location/geofence/BUILD.gn index 5482aeb9..d857e682 100644 --- a/hdf/location/geofence/BUILD.gn +++ b/hdf/location/geofence/BUILD.gn @@ -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 diff --git a/hdf/location/gnss/BUILD.gn b/hdf/location/gnss/BUILD.gn index 0e10fec6..a989e9de 100644 --- a/hdf/location/gnss/BUILD.gn +++ b/hdf/location/gnss/BUILD.gn @@ -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 diff --git a/hdf/manager/BUILD.gn b/hdf/manager/BUILD.gn index 4953aab1..66322ce2 100644 --- a/hdf/manager/BUILD.gn +++ b/hdf/manager/BUILD.gn @@ -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 = [ diff --git a/hdf/motion/BUILD.gn b/hdf/motion/BUILD.gn index a2367501..6789a9a0 100644 --- a/hdf/motion/BUILD.gn +++ b/hdf/motion/BUILD.gn @@ -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" ] diff --git a/hdf/motion/hdi/BUILD.gn b/hdf/motion/hdi/BUILD.gn index 0601b7f3..75fdc124 100644 --- a/hdf/motion/hdi/BUILD.gn +++ b/hdf/motion/hdi/BUILD.gn @@ -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 diff --git a/hdf/nfc/BUILD.gn b/hdf/nfc/BUILD.gn index 11bb2f11..155dea92 100644 --- a/hdf/nfc/BUILD.gn +++ b/hdf/nfc/BUILD.gn @@ -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" ] } diff --git a/hdf/nfc/hdcService/BUILD.gn b/hdf/nfc/hdcService/BUILD.gn index 0a03eb4a..70b90891 100644 --- a/hdf/nfc/hdcService/BUILD.gn +++ b/hdf/nfc/hdcService/BUILD.gn @@ -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 diff --git a/hdf/sensor/common/BUILD.gn b/hdf/sensor/common/BUILD.gn index 602d3c28..53d5daf0 100644 --- a/hdf/sensor/common/BUILD.gn +++ b/hdf/sensor/common/BUILD.gn @@ -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 diff --git a/hdf/vibrator/BUILD.gn b/hdf/vibrator/BUILD.gn index ab69a928..f9d9b474 100644 --- a/hdf/vibrator/BUILD.gn +++ b/hdf/vibrator/BUILD.gn @@ -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" ] diff --git a/hdf/vibrator/common/BUILD.gn b/hdf/vibrator/common/BUILD.gn index fcd0e896..b1503c56 100644 --- a/hdf/vibrator/common/BUILD.gn +++ b/hdf/vibrator/common/BUILD.gn @@ -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 diff --git a/hdf/vibrator/hdi_adapter/BUILD.gn b/hdf/vibrator/hdi_adapter/BUILD.gn index b7115da7..dc303eee 100644 --- a/hdf/vibrator/hdi_adapter/BUILD.gn +++ b/hdf/vibrator/hdi_adapter/BUILD.gn @@ -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", diff --git a/hdf/wlan/BUILD.gn b/hdf/wlan/BUILD.gn index d04c8f8e..8ba78fb5 100644 --- a/hdf/wlan/BUILD.gn +++ b/hdf/wlan/BUILD.gn @@ -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 diff --git a/hdf/wlan/wifi/BUILD.gn b/hdf/wlan/wifi/BUILD.gn index d02cb8ef..d68582e1 100644 --- a/hdf/wlan/wifi/BUILD.gn +++ b/hdf/wlan/wifi/BUILD.gn @@ -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 diff --git a/kernel/BUILD.gn b/kernel/BUILD.gn index 72a560fe..7627d890 100755 --- a/kernel/BUILD.gn +++ b/kernel/BUILD.gn @@ -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", diff --git a/powermgr/battery/hdi_battery/BUILD.gn b/powermgr/battery/hdi_battery/BUILD.gn index 288c9efc..cf66809c 100755 --- a/powermgr/battery/hdi_battery/BUILD.gn +++ b/powermgr/battery/hdi_battery/BUILD.gn @@ -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 diff --git a/powermgr/power/hdi_power/BUILD.gn b/powermgr/power/hdi_power/BUILD.gn index 1f44d805..a2484d3a 100755 --- a/powermgr/power/hdi_power/BUILD.gn +++ b/powermgr/power/hdi_power/BUILD.gn @@ -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 diff --git a/powermgr/thermal/hdi_thermal/BUILD.gn b/powermgr/thermal/hdi_thermal/BUILD.gn index 45cde371..2f3494b6 100755 --- a/powermgr/thermal/hdi_thermal/BUILD.gn +++ b/powermgr/thermal/hdi_thermal/BUILD.gn @@ -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 diff --git a/startup/BUILD.gn b/startup/BUILD.gn index d9d20648..4f0b514d 100644 --- a/startup/BUILD.gn +++ b/startup/BUILD.gn @@ -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" ] diff --git a/useriam/BUILD.gn b/useriam/BUILD.gn index 2b3b4cd7..b1cf26ae 100644 --- a/useriam/BUILD.gn +++ b/useriam/BUILD.gn @@ -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",