From 71c64be68df1cf92f09f9f91a13a62b09b5ccb0f Mon Sep 17 00:00:00 2001 From: zhoushicheng Date: Thu, 23 Jun 2022 15:01:44 +0800 Subject: [PATCH 1/2] aafwk->ability_runtime Signed-off-by: zhoushicheng Change-Id: I6d944c11878a1918edae2a3c78df54002fc68b43 --- frameworks/inputmethod_ability/BUILD.gn | 4 ++-- inputmethod.gni | 6 +++--- interfaces/kits/js/napi/inputmethod/BUILD.gn | 6 +++--- interfaces/kits/js/napi/inputmethodengine/BUILD.gn | 6 +++--- services/BUILD.gn | 6 +++--- unitest/BUILD.gn | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frameworks/inputmethod_ability/BUILD.gn b/frameworks/inputmethod_ability/BUILD.gn index 299d6ca..bb4cf41 100644 --- a/frameworks/inputmethod_ability/BUILD.gn +++ b/frameworks/inputmethod_ability/BUILD.gn @@ -60,8 +60,8 @@ ohos_shared_library("inputmethod_ability") { configs = [ ":inputmethod_ability_native_config" ] deps = [ - "${aafwk_inner_api_path}/ability_manager:ability_manager", - "${aafwk_inner_api_path}/app_manager:app_manager", + "${ability_runtime_inner_api_path}/ability_manager:ability_manager", + "${ability_runtime_inner_api_path}/app_manager:app_manager", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", diff --git a/inputmethod.gni b/inputmethod.gni index 4fa2a7b..fc143de 100644 --- a/inputmethod.gni +++ b/inputmethod.gni @@ -11,12 +11,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -aafwk_inner_api_path = +ability_runtime_inner_api_path = "//foundation/ability/ability_runtime/interfaces/inner_api" -aafwk_services_path = "//foundation/ability/ability_runtime/services" +ability_runtime_services_path = "//foundation/ability/ability_runtime/services" -aafwk_kits_path = "//foundation/ability/ability_runtime/frameworks/kits" +ability_runtime_kits_path = "//foundation/ability/ability_runtime/frameworks/kits" inputmethod_path = "//base/miscservices/inputmethod" diff --git a/interfaces/kits/js/napi/inputmethod/BUILD.gn b/interfaces/kits/js/napi/inputmethod/BUILD.gn index db14ad4..9107c86 100644 --- a/interfaces/kits/js/napi/inputmethod/BUILD.gn +++ b/interfaces/kits/js/napi/inputmethod/BUILD.gn @@ -38,9 +38,9 @@ ohos_shared_library("inputmethod") { configs = [ ":inputmethod_native_config" ] deps = [ - "${aafwk_inner_api_path}/ability_manager:ability_manager", - "${aafwk_inner_api_path}/app_manager:app_manager", - "${aafwk_kits_path}/ability/native:abilitykit_native", + "${ability_runtime_inner_api_path}/ability_manager:ability_manager", + "${ability_runtime_inner_api_path}/app_manager:app_manager", + "${ability_runtime_kits_path}/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/miscservices/inputmethod/frameworks/inputmethod_ability:inputmethod_ability", "//base/miscservices/inputmethod/services:inputmethod_service", diff --git a/interfaces/kits/js/napi/inputmethodengine/BUILD.gn b/interfaces/kits/js/napi/inputmethodengine/BUILD.gn index 7602786..1ac139b 100644 --- a/interfaces/kits/js/napi/inputmethodengine/BUILD.gn +++ b/interfaces/kits/js/napi/inputmethodengine/BUILD.gn @@ -39,9 +39,9 @@ ohos_shared_library("inputmethodengine") { configs = [ ":inputmethodengine_native_config" ] deps = [ - "${aafwk_inner_api_path}/ability_manager:ability_manager", - "${aafwk_inner_api_path}/app_manager:app_manager", - "${aafwk_kits_path}/ability/native:abilitykit_native", + "${ability_runtime_inner_api_path}/ability_manager:ability_manager", + "${ability_runtime_inner_api_path}/app_manager:app_manager", + "${ability_runtime_kits_path}/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/miscservices/inputmethod/frameworks/inputmethod_ability:inputmethod_ability", "//base/miscservices/inputmethod/services:inputmethod_service", diff --git a/services/BUILD.gn b/services/BUILD.gn index 2e88dac..5068a64 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -54,9 +54,9 @@ ohos_shared_library("inputmethod_service") { public_configs = [ ":inputmethod_services_native_config" ] deps = [ - "${aafwk_inner_api_path}/ability_manager:ability_manager", - "${aafwk_inner_api_path}/app_manager:app_manager", - "${aafwk_services_path}/abilitymgr:abilityms", + "${ability_runtime_inner_api_path}/ability_manager:ability_manager", + "${ability_runtime_inner_api_path}/app_manager:app_manager", + "${ability_runtime_services_path}/abilitymgr:abilityms", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/miscservices/inputmethod/etc/para:inputmethod_para", "//base/miscservices/inputmethod/frameworks/inputmethod_ability:inputmethod_ability", diff --git a/unitest/BUILD.gn b/unitest/BUILD.gn index 7d8d1a8..04463b8 100644 --- a/unitest/BUILD.gn +++ b/unitest/BUILD.gn @@ -30,8 +30,8 @@ ohos_unittest("InputMethodControllerTest") { configs = [ ":module_private_config" ] deps = [ - "${aafwk_inner_api_path}/ability_manager:ability_manager", - "${aafwk_services_path}/abilitymgr:abilityms", + "${ability_runtime_inner_api_path}/ability_manager:ability_manager", + "${ability_runtime_services_path}/abilitymgr:abilityms", "//base/miscservices/inputmethod/frameworks/inputmethod_ability:inputmethod_ability", "//base/miscservices/inputmethod/frameworks/inputmethod_controller:inputmethod_client", "//base/miscservices/inputmethod/services:inputmethod_service", @@ -58,8 +58,8 @@ ohos_unittest("InputMethodAbilityTest") { configs = [ ":module_private_config" ] deps = [ - "${aafwk_inner_api_path}/ability_manager:ability_manager", - "${aafwk_services_path}/abilitymgr:abilityms", + "${ability_runtime_inner_api_path}/ability_manager:ability_manager", + "${ability_runtime_services_path}/abilitymgr:abilityms", "//base/miscservices/inputmethod/frameworks/inputmethod_ability:inputmethod_ability", "//base/miscservices/inputmethod/frameworks/inputmethod_controller:inputmethod_client", "//base/miscservices/inputmethod/services:inputmethod_service", From 114b2986d6a7ef3f7445bece0060e34cfadec15d Mon Sep 17 00:00:00 2001 From: zhoushicheng Date: Tue, 28 Jun 2022 10:23:09 +0800 Subject: [PATCH 2/2] aafkw->ability_runtime Signed-off-by: zhoushicheng Change-Id: I5f5cebfa01313d18cf637faff8660f2f628a1c9c --- inputmethod.gni | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/inputmethod.gni b/inputmethod.gni index 4687e5c..d555918 100644 --- a/inputmethod.gni +++ b/inputmethod.gni @@ -13,8 +13,7 @@ ability_runtime_path = "//foundation/ability/ability_runtime" -ability_runtime_inner_api_path = - "${ability_runtime_path}/interfaces/inner_api" +ability_runtime_inner_api_path = "${ability_runtime_path}/interfaces/inner_api" ability_runtime_services_path = "${ability_runtime_path}/services"