diff --git a/README.md b/README.md index c8c4e88..37b5368 100755 --- a/README.md +++ b/README.md @@ -190,4 +190,4 @@ DistributedDeviceProfileClient::GetInstance().UnsubscribeProfileEvents(profileEv **[DeviceProfile子系统](zh-cn_topic_0000001115719369.md)** -[device\_profile\_core](https://gitee.com/openharmony-sig/device_profile_core) \ No newline at end of file +[device\_profile\_core](https://gitee.com/openharmony-sig/device_info_manager) \ No newline at end of file diff --git a/README_zh.md b/README_zh.md index c8c4e88..37b5368 100755 --- a/README_zh.md +++ b/README_zh.md @@ -190,4 +190,4 @@ DistributedDeviceProfileClient::GetInstance().UnsubscribeProfileEvents(profileEv **[DeviceProfile子系统](zh-cn_topic_0000001115719369.md)** -[device\_profile\_core](https://gitee.com/openharmony-sig/device_profile_core) \ No newline at end of file +[device\_profile\_core](https://gitee.com/openharmony-sig/device_info_manager) \ No newline at end of file diff --git a/bundle.json b/bundle.json index a9c10c3..a99b672 100644 --- a/bundle.json +++ b/bundle.json @@ -4,17 +4,17 @@ "version": "3.1", "publishAs": "code-segment", "segment": { - "destPath": "foundation/deviceprofile/device_profile_core" + "destPath": "foundation/deviceprofile/device_info_manager" }, "dirs": {}, "scripts": {}, "license": "Apache License 2.0", "component": { - "name": "device_profile_core", + "name": "device_info_manager", "subsystem": "deviceprofile", "adapted_system_type": [ "standard" ], "hisysevent_config":[ - "//foundation/deviceprofile/device_profile_core/hisysevent.yaml" + "//foundation/deviceprofile/device_info_manager/hisysevent.yaml" ], "rom": "", "ram": "", @@ -42,20 +42,20 @@ "build": { "group_type": { "base_group": [ - "//foundation/deviceprofile/device_profile_core/tools/dp:dp" + "//foundation/deviceprofile/device_info_manager/tools/dp:dp" ], "fwk_group": [ - "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core:distributed_device_profile_client" + "//foundation/deviceprofile/device_info_manager/interfaces/innerkits/core:distributed_device_profile_client" ], "service_group": [ - "//foundation/deviceprofile/device_profile_core/permission:authority_json", - "//foundation/deviceprofile/device_profile_core/sa_profile:dps_sa_profile", - "//foundation/deviceprofile/device_profile_core/services/core:distributed_device_profile" + "//foundation/deviceprofile/device_info_manager/permission:authority_json", + "//foundation/deviceprofile/device_info_manager/sa_profile:dps_sa_profile", + "//foundation/deviceprofile/device_info_manager/services/core:distributed_device_profile" ] }, "inner_kits": [ { - "name": "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core:distributed_device_profile_client", + "name": "//foundation/deviceprofile/device_info_manager/interfaces/innerkits/core:distributed_device_profile_client", "header": { "header_files": [ "distributed_device_profile_client.h", @@ -67,13 +67,13 @@ "service_characteristic_profile.h", "subscribe_info.h" ], - "header_base": "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include/" + "header_base": "//foundation/deviceprofile/device_info_manager/interfaces/innerkits/core/include/" } } ], "test": [ - "//foundation/deviceprofile/device_profile_core/services/core:unittest", - "//foundation/deviceprofile/device_profile_core/services/core/test/fuzztest/deviceprofile_fuzzer:fuzztest" + "//foundation/deviceprofile/device_info_manager/services/core:unittest", + "//foundation/deviceprofile/device_info_manager/services/core/test/fuzztest/deviceprofile_fuzzer:fuzztest" ] } } diff --git a/interfaces/innerkits/core/BUILD.gn b/interfaces/innerkits/core/BUILD.gn index 3ac5536..a920685 100755 --- a/interfaces/innerkits/core/BUILD.gn +++ b/interfaces/innerkits/core/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -device_profile_path = "//foundation/deviceprofile/device_profile_core" +device_profile_path = "//foundation/deviceprofile/device_info_manager" device_profile_service = "${device_profile_path}/services/core" config("distributed_device_profile_client_config") { @@ -51,6 +51,6 @@ ohos_shared_library("distributed_device_profile_client") { ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - part_name = "device_profile_core" + part_name = "device_info_manager" subsystem_name = "deviceprofile" } diff --git a/permission/BUILD.gn b/permission/BUILD.gn index 60c5407..c272d1f 100644 --- a/permission/BUILD.gn +++ b/permission/BUILD.gn @@ -17,6 +17,6 @@ ohos_prebuilt_etc("authority_json") { install_enable = true source = "authority.json" relative_install_dir = "deviceprofile" - part_name = "device_profile_core" + part_name = "device_info_manager" subsystem_name = "deviceprofile" } diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn index 4a55b45..ad61202 100755 --- a/sa_profile/BUILD.gn +++ b/sa_profile/BUILD.gn @@ -15,5 +15,5 @@ import("//build/ohos/sa_profile/sa_profile.gni") ohos_sa_profile("dps_sa_profile") { sources = [ "6001.xml" ] - part_name = "device_profile_core" + part_name = "device_info_manager" } diff --git a/services/core/BUILD.gn b/services/core/BUILD.gn index a901f6d..c73c078 100644 --- a/services/core/BUILD.gn +++ b/services/core/BUILD.gn @@ -14,13 +14,13 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -device_profile_path = "//foundation/deviceprofile/device_profile_core" +device_profile_path = "//foundation/deviceprofile/device_info_manager" device_profile_innerkits = "${device_profile_path}/interfaces/innerkits" services = "${device_profile_path}/services" device_profile_common_sources = [ "${device_profile_path}/common/src/device_profile_utils.cpp" ] -config("device_profile_core_config") { +config("device_info_manager_config") { visibility = [ ":*" ] include_dirs = [ "include", @@ -70,7 +70,7 @@ ohos_shared_library("distributed_device_profile") { ] sources += device_profile_common_sources - configs = [ ":device_profile_core_config" ] + configs = [ ":device_info_manager_config" ] external_deps = [ "access_token:libaccesstoken_sdk", @@ -89,7 +89,7 @@ ohos_shared_library("distributed_device_profile") { "utils_base:utils", ] - part_name = "device_profile_core" + part_name = "device_info_manager" subsystem_name = "deviceprofile" } diff --git a/services/core/test/BUILD.gn b/services/core/test/BUILD.gn index 4852b86..7bc6b0b 100755 --- a/services/core/test/BUILD.gn +++ b/services/core/test/BUILD.gn @@ -15,14 +15,14 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import("//build/test.gni") -module_output_path = "device_profile_core/deviceprofiletest" +module_output_path = "device_info_manager/deviceprofiletest" -device_profile_path = "//foundation/deviceprofile/device_profile_core" +device_profile_path = "//foundation/deviceprofile/device_info_manager" device_profile_innerkits = "${device_profile_path}/interfaces/innerkits" device_profile_service = "${device_profile_path}/services" device_profile_configs = - [ "${device_profile_service}/core:device_profile_core_config" ] + [ "${device_profile_service}/core:device_info_manager_config" ] device_profile_deps = [ "${device_profile_innerkits}/core:distributed_device_profile_client", @@ -47,7 +47,7 @@ ohos_unittest("profile_crud_test") { configs = device_profile_configs deps = device_profile_deps external_deps = device_profile_external_deps - part_name = "device_profile_core" + part_name = "device_info_manager" subsystem_name = "deviceprofile" } @@ -58,7 +58,7 @@ ohos_unittest("event_subscribe_test") { configs = device_profile_configs deps = device_profile_deps external_deps = device_profile_external_deps - part_name = "device_profile_core" + part_name = "device_info_manager" subsystem_name = "deviceprofile" } @@ -72,7 +72,7 @@ ohos_unittest("profile_authority_test") { configs = device_profile_configs deps = [ "//third_party/googletest:gtest_main" ] external_deps = device_profile_external_deps - part_name = "device_profile_core" + part_name = "device_info_manager" subsystem_name = "deviceprofile" } @@ -83,7 +83,7 @@ ohos_unittest("content_sersor_test") { configs = device_profile_configs deps = device_profile_deps external_deps = device_profile_external_deps - part_name = "device_profile_core" + part_name = "device_info_manager" subsystem_name = "deviceprofile" } diff --git a/services/core/test/fuzztest/deviceprofile_fuzzer/BUILD.gn b/services/core/test/fuzztest/deviceprofile_fuzzer/BUILD.gn index c783980..0c8a21d 100644 --- a/services/core/test/fuzztest/deviceprofile_fuzzer/BUILD.gn +++ b/services/core/test/fuzztest/deviceprofile_fuzzer/BUILD.gn @@ -15,13 +15,13 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "device_profile_core/deviceprofile" +module_output_path = "device_info_manager/deviceprofile" -device_profile_path = "//foundation/deviceprofile/device_profile_core" +device_profile_path = "//foundation/deviceprofile/device_info_manager" device_profile_service = "${device_profile_path}/services" device_profile_configs = - [ "${device_profile_service}/core:device_profile_core_config" ] + [ "${device_profile_service}/core:device_info_manager_config" ] device_profile_deps = [ "${device_profile_service}/core:distributed_device_profile" ] @@ -29,7 +29,7 @@ device_profile_deps = ohos_fuzztest("DeviceProfileFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/deviceprofile/device_profile_core/services/core/test/fuzztest/deviceprofile_fuzzer" + fuzz_config_file = "//foundation/deviceprofile/device_info_manager/services/core/test/fuzztest/deviceprofile_fuzzer" cflags = [ "-g", diff --git a/tools/dp/BUILD.gn b/tools/dp/BUILD.gn index ce94017..2191cdb 100755 --- a/tools/dp/BUILD.gn +++ b/tools/dp/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -device_profile_path = "//foundation/deviceprofile/device_profile_core" +device_profile_path = "//foundation/deviceprofile/device_info_manager" config("dp_tools_config") { visibility = [ ":*" ] @@ -40,6 +40,6 @@ ohos_executable("dp") { "utils_base:utils", ] - part_name = "device_profile_core" + part_name = "device_info_manager" subsystem_name = "deviceprofile" }