From 6da7c1cbf7c5f5cf07e9afe7c471c0bb450fb473 Mon Sep 17 00:00:00 2001 From: quanli Date: Thu, 27 Apr 2023 15:39:39 +0800 Subject: [PATCH] quanli1@huawei.com Signed-off-by: quanli --- hdf/bluetooth/hdiService/BUILD.gn | 7 ++++--- hdf/location/agnss/BUILD.gn | 8 +++++--- hdf/location/geofence/BUILD.gn | 5 +++-- hdf/location/gnss/BUILD.gn | 8 +++++--- hdf/nfc/hdcService/BUILD.gn | 13 ++++++++----- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/hdf/bluetooth/hdiService/BUILD.gn b/hdf/bluetooth/hdiService/BUILD.gn index f6db8c58..a329edd5 100644 --- a/hdf/bluetooth/hdiService/BUILD.gn +++ b/hdf/bluetooth/hdiService/BUILD.gn @@ -17,6 +17,7 @@ import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//test/xts/tools/build/suite.gni") module_output_path = "hdf/bluetooth" +root_path = "//drivers/peripheral/bluetooth/hci" ohos_moduletest_suite("HatsBluetoothHdiTest") { module_out_path = module_output_path @@ -26,7 +27,7 @@ ohos_moduletest_suite("HatsBluetoothHdiTest") { ] deps = [ - "//drivers/peripheral/bluetooth/hci/hdi_service:hdi_bluetooth_hci_service", + "${root_path}/hdi_service:hdi_bluetooth_hci_service", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -54,7 +55,7 @@ ohos_moduletest_suite("HatsBluetoothHdiTest") { config("hdf_bluetooth") { include_dirs = [ "include", - "//drivers/peripheral/bluetooth/hci/hdi_service", - "//drivers/peripheral/bluetooth/hci/hdi_service/implement", + "${root_path}/hdi_service", + "${root_path}/hdi_service/implement", ] } diff --git a/hdf/location/agnss/BUILD.gn b/hdf/location/agnss/BUILD.gn index ac4b5e3e..91be9c08 100644 --- a/hdf/location/agnss/BUILD.gn +++ b/hdf/location/agnss/BUILD.gn @@ -14,6 +14,8 @@ import("//build/ohos_var.gni") import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//test/xts/tools/build/suite.gni") +ROOT_PATH = "//drivers/peripheral" +LOCATION_PATH = "../" module_output_path = "hdf/location/agnss" ohos_moduletest_suite("HatsHdfLocationagnssTest") { @@ -56,9 +58,9 @@ ohos_moduletest_suite("HatsHdfLocationagnssTest") { config("hdf_agnss") { include_dirs = [ "include", - "//test/xts/hats/hdf/location/gnss", - "//drivers/peripheral/location/agnss/hdi_service", - "//drivers/peripheral/location/gnss/hdi_service", + "$LOCATION_PATH/gnss", + "$ROOT_PATH/location/agnss/hdi_service", + "$ROOT_PATH/location/gnss/hdi_service", ] cflags = [ "-Wall", diff --git a/hdf/location/geofence/BUILD.gn b/hdf/location/geofence/BUILD.gn index d857e682..53e72336 100644 --- a/hdf/location/geofence/BUILD.gn +++ b/hdf/location/geofence/BUILD.gn @@ -14,6 +14,7 @@ import("//build/ohos_var.gni") import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//test/xts/tools/build/suite.gni") +ROOT_PATH = "//drivers/peripheral" module_output_path = "hdf/location/geofence" ohos_moduletest_suite("HatsHdfLocationgeofenceTest") { @@ -55,8 +56,8 @@ ohos_moduletest_suite("HatsHdfLocationgeofenceTest") { config("hdf_geofence") { include_dirs = [ "include", - "//drivers/peripheral/location/geofence/hdi_service", - "//drivers/peripheral/location/gnss/hdi_service", + "$ROOT_PATH/location/geofence/hdi_service", + "$ROOT_PATH/location/gnss/hdi_service", ] cflags = [ "-Wall", diff --git a/hdf/location/gnss/BUILD.gn b/hdf/location/gnss/BUILD.gn index a989e9de..6f772887 100644 --- a/hdf/location/gnss/BUILD.gn +++ b/hdf/location/gnss/BUILD.gn @@ -15,6 +15,8 @@ import("//build/ohos_var.gni") import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//test/xts/tools/build/suite.gni") +ROOT_PATH = "//drivers/peripheral" + module_output_path = "hdf/location/gnss" ohos_moduletest_suite("HatsHdfLocationgnssTest") { module_out_path = module_output_path @@ -24,7 +26,7 @@ ohos_moduletest_suite("HatsHdfLocationgnssTest") { configs = [ ":hdf_gnss" ] deps = [ - "//drivers/peripheral/location/gnss/hdi_service:liblocation_gnss_hdi_driver", + "${ROOT_PATH}/location/gnss/hdi_service:liblocation_gnss_hdi_driver", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -56,8 +58,8 @@ ohos_moduletest_suite("HatsHdfLocationgnssTest") { config("hdf_gnss") { include_dirs = [ "include", - "//drivers/peripheral/location/geofence/hdi_service", - "//drivers/peripheral/location/gnss/hdi_service", + "${ROOT_PATH}/location/geofence/hdi_service", + "${ROOT_PATH}/location/gnss/hdi_service", ] cflags = [ "-Wall", diff --git a/hdf/nfc/hdcService/BUILD.gn b/hdf/nfc/hdcService/BUILD.gn index 70b90891..abd7de2f 100644 --- a/hdf/nfc/hdcService/BUILD.gn +++ b/hdf/nfc/hdcService/BUILD.gn @@ -16,6 +16,9 @@ import("//build/ohos_var.gni") import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//test/xts/tools/build/suite.gni") +base_root = "//drivers" +root_path = "//foundation/communication" + module_output_path = "hdf/nfc" ohos_moduletest_suite("HatsHdfNfcHdiTest") { @@ -23,9 +26,9 @@ ohos_moduletest_suite("HatsHdfNfcHdiTest") { sources = [ "nfc_services_test.cpp" ] deps = [ - "//drivers/interface/nfc/v1_0:libnfc_proxy_1.0", - "//drivers/peripheral/nfc/hdi_service:hdi_nfc_service", - "//foundation/communication/nfc/services:nfc_service", + "${base_root}/interface/nfc/v1_0:libnfc_proxy_1.0", + "${base_root}/peripheral/nfc/hdi_service:hdi_nfc_service", + "${root_path}/nfc/services:nfc_service", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -53,8 +56,8 @@ ohos_moduletest_suite("HatsHdfNfcHdiTest") { config("hdf_nfc") { include_dirs = [ "include", - "//drivers/peripheral/nfc/hdi_service", - "//drivers/peripheral/nfc/vendor_adaptor", + "${base_root}/peripheral/nfc/hdi_service", + "${base_root}/peripheral/nfc/vendor_adaptor", "//third_party/nfc_hdiimpl/SN100x/halimpl/inc", "//third_party/libnfc-nci/SN100x/src/include/", "//third_party/libnfc-nci/SN100x/utils/include/",