diff --git a/frameworks/inputmethod_ability/BUILD.gn b/frameworks/inputmethod_ability/BUILD.gn index cd3f596..580025c 100644 --- a/frameworks/inputmethod_ability/BUILD.gn +++ b/frameworks/inputmethod_ability/BUILD.gn @@ -65,7 +65,7 @@ ohos_shared_library("inputmethod_ability") { "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/ace/napi/:ace_napi", + "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", diff --git a/inputmethod.gni b/inputmethod.gni index a9bee41..b806890 100644 --- a/inputmethod.gni +++ b/inputmethod.gni @@ -1,20 +1,20 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# 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 +# Copyright (C) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# 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. - -inputmethod_path = "//base/miscservices/inputmethod" - -kits_path = "${inputmethod_path}/interfaces/kits" - -innerkits_path = "${inputmethod_path}/interfaces/innerkits" - -adapter_path = "${inputmethod_path}/adapter" \ No newline at end of file + +inputmethod_path = "//base/miscservices/inputmethod" + +kits_path = "${inputmethod_path}/interfaces/kits" + +innerkits_path = "${inputmethod_path}/interfaces/innerkits" + +adapter_path = "${inputmethod_path}/adapter" diff --git a/interfaces/kits/js/napi/inputmethod/BUILD.gn b/interfaces/kits/js/napi/inputmethod/BUILD.gn index b96780b..aa9d1a4 100644 --- a/interfaces/kits/js/napi/inputmethod/BUILD.gn +++ b/interfaces/kits/js/napi/inputmethod/BUILD.gn @@ -46,7 +46,7 @@ ohos_shared_library("inputmethod") { "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/ace/napi/:ace_napi", + "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", diff --git a/interfaces/kits/js/napi/inputmethodengine/BUILD.gn b/interfaces/kits/js/napi/inputmethodengine/BUILD.gn index a7dfef3..45df583 100644 --- a/interfaces/kits/js/napi/inputmethodengine/BUILD.gn +++ b/interfaces/kits/js/napi/inputmethodengine/BUILD.gn @@ -47,7 +47,7 @@ ohos_shared_library("inputmethodengine") { "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/ace/napi/:ace_napi", + "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", diff --git a/services/BUILD.gn b/services/BUILD.gn index 460d073..18b4677 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -62,9 +62,9 @@ ohos_shared_library("inputmethod_service") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", - "//foundation/ace/napi/:ace_napi", - "//foundation/ace/napi/:ace_napi", + "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr", + "//foundation/arkui/napi/:ace_napi", + "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", diff --git a/services/dialog/js/BUILD.gn b/services/dialog/js/BUILD.gn index 469d1ad..7655b93 100644 --- a/services/dialog/js/BUILD.gn +++ b/services/dialog/js/BUILD.gn @@ -10,7 +10,7 @@ # 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. -import("//foundation/ace/ace_engine/build/ace_gen_sa_dialog_js.gni") +import("//foundation/arkui/ace_engine/build/ace_gen_sa_dialog_js.gni") gen_sa_dialog_js("dialog_ime_js_files_etc") { project_path = "//base/miscservices/inputmethod/services/dialog/js/" diff --git a/unitest/BUILD.gn b/unitest/BUILD.gn index e4552b8..26708a4 100644 --- a/unitest/BUILD.gn +++ b/unitest/BUILD.gn @@ -35,7 +35,7 @@ ohos_unittest("InputMethodControllerTest") { "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/ace/napi/:ace_napi", + "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -61,7 +61,7 @@ ohos_unittest("InputMethodAbilityTest") { "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/ace/napi/:ace_napi", + "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",