From 0e797e32a7f7c0105c9df560cd246a34c1d635e0 Mon Sep 17 00:00:00 2001 From: renguang1116 Date: Thu, 9 Jun 2022 10:47:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?device=5Fmanager=E6=A8=A1=E5=9D=97=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E9=83=A8=E4=BB=B6=E5=90=8D=E5=92=8C=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=90=8D=20Signed-off-by:=20renguang1116=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- access_token.gni | 2 +- services/accesstokenmanager/BUILD.gn | 2 +- services/tokensyncmanager/BUILD.gn | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/access_token.gni b/access_token.gni index 3d92eff5c..c584f3c67 100644 --- a/access_token.gni +++ b/access_token.gni @@ -12,7 +12,7 @@ # limitations under the License. if (!defined(global_parts_info) || - defined(global_parts_info.distributedhardware_device_manager_base)) { + defined(global_parts_info.distributedhardware_device_manager)) { token_sync_enable = true } else { token_sync_enable = false diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn index 136d70f60..69b5632f7 100644 --- a/services/accesstokenmanager/BUILD.gn +++ b/services/accesstokenmanager/BUILD.gn @@ -90,7 +90,7 @@ ohos_shared_library("accesstoken_manager_service") { } external_deps = [ - "device_manager_base:devicemanagersdk", + "device_manager:devicemanagersdk", "dsoftbus_standard:softbus_client", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/tokensyncmanager/BUILD.gn b/services/tokensyncmanager/BUILD.gn index b79f0fb5f..63e1e7593 100644 --- a/services/tokensyncmanager/BUILD.gn +++ b/services/tokensyncmanager/BUILD.gn @@ -79,7 +79,7 @@ ohos_shared_library("token_sync_manager_service") { } external_deps = [ - "device_manager_base:devicemanagersdk", + "device_manager:devicemanagersdk", "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", -- Gitee From 946b52c61841d53067e03be2aac54d463581d114 Mon Sep 17 00:00:00 2001 From: renguang1116 Date: Thu, 9 Jun 2022 14:58:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?device=5Fmanager=E6=A8=A1=E5=9D=97=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E9=83=A8=E4=BB=B6=E5=90=8D=E5=92=8C=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=90=8D=20Signed-off-by:=20renguang1116=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interfaces/innerkits/tokensync/BUILD.gn | 2 +- services/accesstokenmanager/BUILD.gn | 2 +- .../test/unittest/token_sync_service/BUILD.gn | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/tokensync/BUILD.gn b/interfaces/innerkits/tokensync/BUILD.gn index 24cb4826c..e53e02f50 100644 --- a/interfaces/innerkits/tokensync/BUILD.gn +++ b/interfaces/innerkits/tokensync/BUILD.gn @@ -35,7 +35,7 @@ ohos_shared_library("libtokensync_sdk") { "//base/security/access_token/interfaces/innerkits/tokensync/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//base/security/access_token/frameworks/accesstoken/include", - "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include", + "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", ] diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn index 69b5632f7..43db3e913 100644 --- a/services/accesstokenmanager/BUILD.gn +++ b/services/accesstokenmanager/BUILD.gn @@ -40,7 +40,7 @@ ohos_shared_library("accesstoken_manager_service") { "//base/security/access_token/interfaces/innerkits/privacy/include", "//base/security/access_token/interfaces/innerkits/tokensync/src", "//base/security/access_token/services/tokensyncmanager/include/common", - "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include", + "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "//third_party/json/include", ] diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn index 62403189d..1a9c990b3 100644 --- a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn +++ b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn @@ -66,7 +66,7 @@ ohos_unittest("libtoken_sync_service_sdk_test") { "//foundation/communication/dsoftbus/interfaces/kits/transport", "//foundation/communication/dsoftbus/interfaces/kits/common", "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include", + "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", ] deps = [ @@ -74,7 +74,7 @@ ohos_unittest("libtoken_sync_service_sdk_test") { "//base/security/access_token/frameworks/common:accesstoken_common_cxx", "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", - "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", + "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/zlib:libz", "//utils/native/base:utils", ] -- Gitee