diff --git a/frameworks/inputmethod_ability/BUILD.gn b/frameworks/inputmethod_ability/BUILD.gn index 087c355..299d6ca 100644 --- a/frameworks/inputmethod_ability/BUILD.gn +++ b/frameworks/inputmethod_ability/BUILD.gn @@ -60,9 +60,9 @@ 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", "//base/global/resource_management/frameworks/resmgr:global_resmgr", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", diff --git a/inputmethod.gni b/inputmethod.gni index b806890..b8d98f8 100644 --- a/inputmethod.gni +++ b/inputmethod.gni @@ -9,7 +9,13 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. +# limitations under the License. + +aafwk_inner_api_path = "//foundation/aafwk/standard/interfaces/innerkits" + +aafwk_services_path = "//foundation/aafwk/standard/services" + +aafwk_kits_path = "//foundation/aafwk/standard/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 f1008dd..db14ad4 100644 --- a/interfaces/kits/js/napi/inputmethod/BUILD.gn +++ b/interfaces/kits/js/napi/inputmethod/BUILD.gn @@ -38,12 +38,12 @@ 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", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/miscservices/inputmethod/frameworks/inputmethod_ability:inputmethod_ability", "//base/miscservices/inputmethod/services:inputmethod_service", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", diff --git a/interfaces/kits/js/napi/inputmethodengine/BUILD.gn b/interfaces/kits/js/napi/inputmethodengine/BUILD.gn index 1b8f888..7602786 100644 --- a/interfaces/kits/js/napi/inputmethodengine/BUILD.gn +++ b/interfaces/kits/js/napi/inputmethodengine/BUILD.gn @@ -39,12 +39,12 @@ 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", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/miscservices/inputmethod/frameworks/inputmethod_ability:inputmethod_ability", "//base/miscservices/inputmethod/services:inputmethod_service", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", diff --git a/services/BUILD.gn b/services/BUILD.gn index cb9465c..2e88dac 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -54,12 +54,12 @@ 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", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/miscservices/inputmethod/etc/para:inputmethod_para", "//base/miscservices/inputmethod/frameworks/inputmethod_ability:inputmethod_ability", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr", "//foundation/arkui/napi/:ace_napi", "//foundation/arkui/napi/:ace_napi", diff --git a/unitest/BUILD.gn b/unitest/BUILD.gn index 73e6fa0..7d8d1a8 100644 --- a/unitest/BUILD.gn +++ b/unitest/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/miscservices/inputmethod/inputmethod.gni") import("//build/test.gni") config("module_private_config") { @@ -29,11 +30,11 @@ ohos_unittest("InputMethodControllerTest") { configs = [ ":module_private_config" ] deps = [ + "${aafwk_inner_api_path}/ability_manager:ability_manager", + "${aafwk_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", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", @@ -57,11 +58,11 @@ ohos_unittest("InputMethodAbilityTest") { configs = [ ":module_private_config" ] deps = [ + "${aafwk_inner_api_path}/ability_manager:ability_manager", + "${aafwk_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", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",