From a5ad53ce11a2e8faef994c45e7ae538bc1f68091 Mon Sep 17 00:00:00 2001 From: zhoushicheng Date: Mon, 20 Jun 2022 16:26:36 +0800 Subject: [PATCH 1/2] aafwk->ability_runtime Signed-off-by: zhoushicheng Change-Id: I4621d124f927a5c88eaced2b60fc5f3ce6bc6ad3 --- tools/accesstoken/BUILD.gn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/accesstoken/BUILD.gn b/tools/accesstoken/BUILD.gn index e24569afd..f7d37da20 100644 --- a/tools/accesstoken/BUILD.gn +++ b/tools/accesstoken/BUILD.gn @@ -12,27 +12,27 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/ability/ability_runtime/aafwk.gni") +import("//foundation/ability/ability_runtime/ability_runtime.gni") ohos_source_set("tools_atm_source_set") { include_dirs = [ "include", "//base/security/access_token/frameworks/common/include", - "${aafwk_path}/tools/aa/include", + "${ability_runtime_path}/tools/aa/include", "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include", "//base/security/access_token/interfaces/innerkits/privacy/include", "${services_path}/common/include", ] sources = [ - "${aafwk_path}/tools/aa/src/shell_command.cpp", + "${ability_runtime_path}/tools/aa/src/shell_command.cpp", "src/atm_command.cpp", "src/atm_receiver_impl.cpp", "src/main.cpp", ] deps = [ - "${aafwk_path}/tools/aa:aa", + "${ability_runtime_path}/tools/aa:aa", "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/security/access_token/interfaces/innerkits/privacy:libprivacy_sdk", "//utils/native/base:utils", -- Gitee From 6ae3af871de5db3d1b14b2e86e523b6cca934191 Mon Sep 17 00:00:00 2001 From: zhoushicheng Date: Wed, 22 Jun 2022 20:35:26 +0800 Subject: [PATCH 2/2] aafwk->ability_runtime Signed-off-by: zhoushicheng Change-Id: Iff174be2a98b6fce7d65a99fd72c3067078cb740 --- tools/accesstoken/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/accesstoken/BUILD.gn b/tools/accesstoken/BUILD.gn index f7d37da20..d87974693 100644 --- a/tools/accesstoken/BUILD.gn +++ b/tools/accesstoken/BUILD.gn @@ -21,7 +21,7 @@ ohos_source_set("tools_atm_source_set") { "${ability_runtime_path}/tools/aa/include", "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include", "//base/security/access_token/interfaces/innerkits/privacy/include", - "${services_path}/common/include", + "${ability_runtime_services_path}/common/include", ] sources = [ -- Gitee