From fb2fc601f56aade425a5daab09a1118404929825 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 8 Jun 2022 14:41:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=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: wanderer-dl122 --- README_zh.md | 2 +- bundle.json | 26 +++++++++---------- distributedhardwarefwk.gni | 2 +- .../distributedhardwarefwkservice/BUILD.gn | 2 +- .../fuzztest/accessmanager_fuzzer/BUILD.gn | 6 ++--- .../unittest/common/accessmanager/BUILD.gn | 4 +-- .../BUILD.gn | 2 +- .../fuzztest/componentmanager_fuzzer/BUILD.gn | 8 +++--- .../fuzztest/resourcemanager_fuzzer/BUILD.gn | 6 ++--- .../test/unittest/common/BUILD.gn | 6 ++--- .../unittest/common/componentloader/BUILD.gn | 4 +-- .../unittest/common/componentmanager/BUILD.gn | 6 ++--- .../unittest/common/resourcemanager/BUILD.gn | 6 ++--- .../test/unittest/common/task/BUILD.gn | 6 ++--- .../unittest/common/versionmanager/BUILD.gn | 4 +-- utils/BUILD.gn | 2 +- utils/test/fuzztest/utils_fuzzer/BUILD.gn | 6 ++--- utils/test/unittest/common/eventbus/BUILD.gn | 4 +-- utils/test/unittest/common/utilstool/BUILD.gn | 4 +-- 19 files changed, 53 insertions(+), 53 deletions(-) diff --git a/README_zh.md b/README_zh.md index 5d38a176..1f95cbb2 100644 --- a/README_zh.md +++ b/README_zh.md @@ -23,7 +23,7 @@ ## **目录** ``` -/foundation/distributedhardware/distributedhardwarefwk +/foundation/distributedhardware/distributed_hardware_fwk ├── common # 分布式硬件管理框架为各个部件提供的公共接口类 ├── sa_profile # 分布式硬件管理框架的SA配置信息 ├── services # 分布式硬件管理框架的SA具体实现 diff --git a/bundle.json b/bundle.json index 08a4998a..9f624556 100644 --- a/bundle.json +++ b/bundle.json @@ -7,7 +7,7 @@ "license": "Apache License 2.0", "publishAs": "code-segment", "segment": { - "destPath": "foundation/distributedhardware/distributedhardwarefwk/" + "destPath": "foundation/distributedhardware/distributed_hardware_fwk/" }, "dirs": {}, "scripts": {}, @@ -15,7 +15,7 @@ "name": "distributed_hardware_fwk", "subsystem": "distributedhardware", "syscap": [ - "SystemCapability.distributedhardware.distributed_hardware_fwk" + "SystemCapability.DistributedHardware.DistributedHardwareFWK" ], "features": [], "adapted_system_type": [ @@ -43,19 +43,19 @@ }, "build": { "sub_component": [ - "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", - "//foundation/distributedhardware/distributedhardwarefwk/sa_profile:dhfwk_sa_profile", - "//foundation/distributedhardware/distributedhardwarefwk/sa_profile:dhardware.cfg" + "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/sa_profile:dhfwk_sa_profile", + "//foundation/distributedhardware/distributed_hardware_fwk/sa_profile:dhardware.cfg" ], "test": [ - "//foundation/distributedhardware/distributedhardwarefwk/utils/test/unittest:utils_test", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/unittest:svrimpl_test", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/unittest:test", - "//foundation/distributedhardware/distributedhardwarefwk/utils/test/fuzztest:fuzztest", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/fuzztest:fuzztest", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/fuzztest:fuzztest" + "//foundation/distributedhardware/distributed_hardware_fwk/utils/test/unittest:utils_test", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl/test/unittest:svrimpl_test", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/unittest:test", + "//foundation/distributedhardware/distributed_hardware_fwk/utils/test/fuzztest:fuzztest", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl/test/fuzztest:fuzztest", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest:fuzztest" ] } } diff --git a/distributedhardwarefwk.gni b/distributedhardwarefwk.gni index 3727b4cf..9bbb9538 100644 --- a/distributedhardwarefwk.gni +++ b/distributedhardwarefwk.gni @@ -12,7 +12,7 @@ # limitations under the License. distributedhardwarefwk_path = - "//foundation/distributedhardware/distributedhardwarefwk" + "//foundation/distributedhardware/distributed_hardware_fwk" common_path = "${distributedhardwarefwk_path}/common" diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index b17f50eb..2bc789b8 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") ohos_shared_library("distributedhardwarefwksvr") { include_dirs = [ diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 53d89fa2..13644935 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -15,12 +15,12 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## ohos_fuzztest("AccessmanagerFuzzTest") { module_out_path = "distributed_hardware_fwk/accessmanager" - fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer" + fuzz_config_file = "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer" include_dirs = [ "//utils/native/base/include", @@ -45,7 +45,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") { deps = [ "${utils_path}:distributedhardwareutils", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 74c8c30e..eaec89ea 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") module_out_path = "distributed_hardware_fwk/access_manager_test" @@ -47,7 +47,7 @@ ohos_unittest("AccessManagerTest") { deps = [ "${utils_path}:distributedhardwareutils", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//third_party/googletest:gtest_main", ] diff --git a/services/distributedhardwarefwkserviceimpl/BUILD.gn b/services/distributedhardwarefwkserviceimpl/BUILD.gn index 53cfb524..ce14c0a6 100644 --- a/services/distributedhardwarefwkserviceimpl/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") ohos_shared_library("distributedhardwarefwksvr_impl") { include_dirs = [ diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn index 5314afb0..9bbed5ab 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn @@ -15,12 +15,12 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## ohos_fuzztest("ComponentmanagerFuzzTest") { module_out_path = "distributed_hardware_fwk/componentmanager" - fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer" + fuzz_config_file = "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer" include_dirs = [ "${utils_path}/include", @@ -41,8 +41,8 @@ ohos_fuzztest("ComponentmanagerFuzzTest") { sources = [ "componentmanager_fuzzer.cpp" ] deps = [ - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", - "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", ] defines = [ diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index 4ff5522b..9ad9584c 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## ohos_fuzztest("ResourcemanagerFuzzTest") { @@ -45,8 +45,8 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { sources = [ "resourcemanager_fuzzer.cpp" ] deps = [ - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", - "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//utils/native/base:utils", ] diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn index 1c07a3a2..94357480 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") module_out_path = "distributed_hardware_fwk/dh_manager_test" @@ -41,8 +41,8 @@ ohos_unittest("DistributedHardwareManagerTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", - "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn index c94546ee..0d7d3267 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") module_out_path = "distributed_hardware_fwk/component_loader_test" @@ -40,7 +40,7 @@ ohos_unittest("ComponentLoaderTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", "//third_party/googletest:gtest_main", ] diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn index 82f4f3ce..a45d0072 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") module_out_path = "distributed_hardware_fwk/component_manager_test" @@ -40,8 +40,8 @@ ohos_unittest("ComponentManagerTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", - "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn index bcf729a8..f5b63db7 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") module_out_path = "distributed_hardware_fwk/resource_manager_test" @@ -45,8 +45,8 @@ ohos_unittest("ResourceManagerTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", - "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn index d4b88904..bbddc9ad 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") module_out_path = "distributed_hardware_fwk/dh_task_test" @@ -48,8 +48,8 @@ ohos_unittest("DHTaskTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", - "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gtest_main", ] diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn index b9d63e31..60f92bc8 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") module_out_path = "distributed_hardware_fwk/version_manager_test" @@ -41,7 +41,7 @@ ohos_unittest("VersionManagerTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", "//third_party/googletest:gtest_main", ] diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 27018ede..a5b5352b 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") ohos_shared_library("distributedhardwareutils") { include_dirs = [ diff --git a/utils/test/fuzztest/utils_fuzzer/BUILD.gn b/utils/test/fuzztest/utils_fuzzer/BUILD.gn index 89e64ef8..fb65842d 100644 --- a/utils/test/fuzztest/utils_fuzzer/BUILD.gn +++ b/utils/test/fuzztest/utils_fuzzer/BUILD.gn @@ -15,12 +15,12 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## ohos_fuzztest("UtilsFuzzTest") { module_out_path = "distributed_hardware_fwk/utils" - fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/utils/test/fuzztest/utils_fuzzer" + fuzz_config_file = "//foundation/distributedhardware/distributed_hardware_fwk/utils/test/fuzztest/utils_fuzzer" include_dirs = [ "${utils_path}/include", @@ -36,7 +36,7 @@ ohos_fuzztest("UtilsFuzzTest") { ] sources = [ "utils_fuzzer.cpp" ] - deps = [ "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils" ] + deps = [ "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils" ] } ############################################################################### diff --git a/utils/test/unittest/common/eventbus/BUILD.gn b/utils/test/unittest/common/eventbus/BUILD.gn index ca74d213..c85bc2c4 100644 --- a/utils/test/unittest/common/eventbus/BUILD.gn +++ b/utils/test/unittest/common/eventbus/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") module_out_path = "distributed_hardware_fwk/event_bus_test" @@ -38,7 +38,7 @@ ohos_unittest("EventBusTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", + "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gtest_main", ] diff --git a/utils/test/unittest/common/utilstool/BUILD.gn b/utils/test/unittest/common/utilstool/BUILD.gn index 1bf17c04..3287ca43 100644 --- a/utils/test/unittest/common/utilstool/BUILD.gn +++ b/utils/test/unittest/common/utilstool/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") module_out_path = "distributed_hardware_fwk/utils_tool_test" @@ -38,7 +38,7 @@ ohos_unittest("UtilsToolTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils", + "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gtest_main", ] } -- Gitee From 859166a9552f6abb9d42257adf8f7d61016fcba2 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 8 Jun 2022 15:27:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=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: wanderer-dl122 --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 62d2878f..7f5dcf11 100644 --- a/bundle.json +++ b/bundle.json @@ -24,7 +24,7 @@ "rom": "128K", "ram": "6M", "hisysevent_config": [ - "//foundation/distributedhardware/distributedhardwarefwk/hisysevent.yaml" + "//foundation/distributedhardware/distributed_hardware_fwk/hisysevent.yaml" ], "deps": { "components": [ -- Gitee