openharmony/miscservices_inputmethod
1
0
Fork 0
mirror of https://github.com/openharmony/miscservices_inputmethod.git synced 2026-07-20 23:45:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

!174 Gitee Review - change_misc_components

Browse Source 
Merge pull request !174 from 鲍亚永/change_misc_components
This commit is contained in:
openharmony_ci
2022-07-22 06:18:59 +00:00
committed by Gitee
parent f866716f16 20a717e635
commit 60200686c3
16 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BUILD.gn
+2 -2
View File
@@ -15,7 +15,7 @@ import("//build/ohos.gni")
################################################################################
group("inputmethod_native_packages") {
group("imf_packages") {
if (is_standard_system) {
deps = [
"etc/init:inputmethodservice.cfg",
@@ -26,7 +26,7 @@ group("inputmethod_native_packages") {
"interfaces/kits/js/declaration:inputmethod",
"interfaces/kits/js/napi/inputmethod:inputmethod",
"interfaces/kits/js/napi/inputmethodengine:inputmethodengine",
"profile:miscservices_inputmethod_sa_profiles",
"profile:inputmethod_inputmethod_sa_profiles",
"services:inputmethod_service",
]
}
bundle.json
+20 -20
View File
@@ -1,24 +1,24 @@
{
"name": "@ohos/inputmethod",
"name": "@ohos/imf",
"description": "Provide input capability to ime app",
"version": "3.1",
"license": "Apache License 2.0",
"publishAs": "code-segment",
"segment": {
"destPath": "base/miscservices/inputmethod"
"destPath": "base/inputmethod/imf"
},
"dirs": {},
"scripts": {},
"component": {
"name": "inputmethod_native",
"subsystem": "miscservices",
"name": "imf",
"subsystem": "inputmethod",
"syscap": [
"SystemCapability.MiscServices.InputMethod"
],
"features": [
],
"hisysevent_config": [
"//base/miscservices/inputmethod/hisysevent.yaml"
"//base/inputmethod/imf/hisysevent.yaml"
],
"adapted_system_type": [
"standard"
@@ -49,11 +49,11 @@
},
"build": {
"sub_component": [
"//base/miscservices/inputmethod:inputmethod_native_packages"
"//base/inputmethod/imf:imf_packages"
],
"inner_kits": [
{
"name": "//base/miscservices/inputmethod/services:inputmethod_service",
"name": "//base/inputmethod/imf/services:inputmethod_service",
"header": {
"header_files": [
"global.h",
@@ -74,11 +74,11 @@
"platform.h",
"platform_callback_stub.h"
],
"header_base": "//base/miscservices/inputmethod/services/include"
"header_base": "//base/inputmethod/imf/services/include"
}
},
{
"name": "//base/miscservices/inputmethod/frameworks/inputmethod_controller:inputmethod_client",
"name": "//base/inputmethod/imf/frameworks/inputmethod_controller:inputmethod_client",
"header": {
"header_files": [
"i_input_client.h",
@@ -91,11 +91,11 @@
"input_method_system_ability_proxy.h",
"input_method_utils.h"
],
"header_base": "//base/miscservices/inputmethod/frameworks/inputmethod_controller/include"
"header_base": "//base/inputmethod/imf/frameworks/inputmethod_controller/include"
}
},
{
"name": "//base/miscservices/inputmethod/frameworks/inputmethod_ability:inputmethod_ability",
"name": "//base/inputmethod/imf/frameworks/inputmethod_ability:inputmethod_ability",
"header": {
"header_files": [
"i_input_method_agent.h",
@@ -106,11 +106,11 @@
"input_method_core_proxy.h",
"input_method_core_stub.h"
],
"header_base": "//base/miscservices/inputmethod/frameworks/inputmethod_ability/include"
"header_base": "//base/inputmethod/imf/frameworks/inputmethod_ability/include"
}
},
{
"name": "//base/miscservices/inputmethod/interfaces/kits/js/napi/inputmethod:inputmethod",
"name": "//base/inputmethod/imf/interfaces/kits/js/napi/inputmethod:inputmethod",
"header": {
"header_files": [
"js_input_method_registry.h",
@@ -118,11 +118,11 @@
"js_input_method_setting.h",
"js_input_method_controller.h"
],
"header_base": "//base/miscservices/inputmethod/interfaces/kits/js/napi/inputmethod/include"
"header_base": "//base/inputmethod/imf/interfaces/kits/js/napi/inputmethod/include"
}
},
{
"name": "//base/miscservices/inputmethod/interfaces/kits/js/napi/inputmethodengine:inputmethodengine",
"name": "//base/inputmethod/imf/interfaces/kits/js/napi/inputmethodengine:inputmethodengine",
"header": {
"header_files": [
"js_input_method_engine_registry.h",
@@ -133,15 +133,15 @@
"js_text_input_client.h",
"js_keyboard_delegate.h"
],
"header_base": "//base/miscservices/inputmethod/interfaces/kits/js/napi/inputmethodengine/include"
"header_base": "//base/inputmethod/imf/interfaces/kits/js/napi/inputmethodengine/include"
}
}
],
"test": [
"//base/miscservices/inputmethod/unitest:InputMethodControllerTest",
"//base/miscservices/inputmethod/unitest:InputMethodAbilityTest",
"//base/miscservices/inputmethod/test/fuzztest:fuzztest"
"//base/inputmethod/imf/unitest:InputMethodControllerTest",
"//base/inputmethod/imf/unitest:InputMethodAbilityTest",
"//base/inputmethod/imf/test/fuzztest:fuzztest"
]
}
}
}
}
etc/init/BUILD.gn
+2 -2
View File
@@ -18,6 +18,6 @@ import("//build/ohos.gni")
ohos_prebuilt_etc("inputmethodservice.cfg") {
source = "inputmethodservice.cfg"
relative_install_dir = "init"
part_name = "inputmethod_native"
subsystem_name = "miscservices"
part_name = "imf"
subsystem_name = "inputmethod"
}
etc/para/BUILD.gn
+5 -5
View File
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/inputmethod/inputmethod.gni")
import("//base/inputmethod/imf/inputmethod.gni")
import("//build/ohos.gni")
config("inputmethod_para_config") {
@@ -31,12 +31,12 @@ ohos_shared_library("inputmethod_para") {
"init:libbegetutil",
]
public_configs = [ ":inputmethod_para_public_config" ]
subsystem_name = "miscservices"
part_name = "inputmethod_native"
subsystem_name = "inputmethod"
part_name = "imf"
}
ohos_prebuilt_etc("inputmethod.para") {
source = "//base/miscservices/inputmethod/etc/para/inputmethod.para"
part_name = "inputmethod_native"
source = "//base/inputmethod/imf/etc/para/inputmethod.para"
part_name = "imf"
module_install_dir = "etc/param"
}
frameworks/inputmethod_ability/BUILD.gn
+3 -3
View File
@@ -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("//base/miscservices/inputmethod/inputmethod.gni")
import("//base/inputmethod/imf/inputmethod.gni")
import("//build/ohos.gni")
config("inputmethod_ability_native_config") {
@@ -82,6 +82,6 @@ ohos_shared_library("inputmethod_ability") {
public_configs = [ ":inputmethod_ability_native_public_config" ]
subsystem_name = "miscservices"
part_name = "inputmethod_native"
subsystem_name = "inputmethod"
part_name = "imf"
}
frameworks/inputmethod_controller/BUILD.gn
+6 -6
View File
@@ -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("//base/miscservices/inputmethod/inputmethod.gni")
import("//base/inputmethod/imf/inputmethod.gni")
import("//build/ohos.gni")
config("inputmethod_client_native_config") {
@@ -26,9 +26,9 @@ config("inputmethod_client_native_config") {
config("inputmethod_client_native_public_config") {
visibility = []
include_dirs = [
"//base/miscservices/inputmethod/frameworks/inputmethod_controller/include",
"//base/miscservices/inputmethod/frameworks/inputmethod_ability/include",
"//base/miscservices/inputmethod/services/include",
"//base/inputmethod/imf/frameworks/inputmethod_controller/include",
"//base/inputmethod/imf/frameworks/inputmethod_ability/include",
"//base/inputmethod/imf/services/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"${inputmethod_path}/services/dfx/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
@@ -77,6 +77,6 @@ ohos_shared_library("inputmethod_client") {
public_configs = [ ":inputmethod_client_native_public_config" ]
subsystem_name = "miscservices"
part_name = "inputmethod_native"
subsystem_name = "inputmethod"
part_name = "imf"
}
inputmethod.gni
+1 -1
View File
@@ -19,7 +19,7 @@ ability_runtime_services_path = "${ability_runtime_path}/services"
ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
inputmethod_path = "//base/miscservices/inputmethod"
inputmethod_path = "//base/inputmethod/imf"
kits_path = "${inputmethod_path}/interfaces/kits"
interfaces/kits/js/declaration/BUILD.gn
+1 -1
View File
@@ -15,7 +15,7 @@ import("//build/ohos.gni")
import("//build/ohos/ace/ace.gni")
js_declaration("inputmethod") {
part_name = "inputmethod_native"
part_name = "imf"
sources = [ "./api" ]
}
interfaces/kits/js/napi/inputmethod/BUILD.gn
+9 -9
View File
@@ -10,15 +10,15 @@
# 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("//base/miscservices/inputmethod/inputmethod.gni")
import("//base/inputmethod/imf/inputmethod.gni")
import("//build/ohos.gni")
config("inputmethod_native_config") {
config("imf_config") {
visibility = [ ":*" ]
include_dirs = [ "include" ]
}
config("inputmethod_native_public_config") {
config("imf_public_config") {
visibility = []
include_dirs = [ "include" ]
}
@@ -35,15 +35,15 @@ ohos_shared_library("inputmethod") {
"src/js_input_method_utils.cpp",
]
configs = [ ":inputmethod_native_config" ]
configs = [ ":imf_config" ]
deps = [
"${ability_runtime_inner_api_path}/ability_manager:ability_manager",
"${ability_runtime_inner_api_path}/app_manager:app_manager",
"${ability_runtime_path}/frameworks/native/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",
"//base/inputmethod/imf/frameworks/inputmethod_ability:inputmethod_ability",
"//base/inputmethod/imf/services:inputmethod_service",
"//foundation/arkui/napi/:ace_napi",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
@@ -62,9 +62,9 @@ ohos_shared_library("inputmethod") {
"ipc:ipc_core",
]
public_configs = [ ":inputmethod_native_public_config" ]
public_configs = [ ":imf_public_config" ]
relative_install_dir = "module"
subsystem_name = "miscservices"
part_name = "inputmethod_native"
subsystem_name = "inputmethod"
part_name = "imf"
}
interfaces/kits/js/napi/inputmethodengine/BUILD.gn
+6 -6
View File
@@ -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("//base/miscservices/inputmethod/inputmethod.gni")
import("//base/inputmethod/imf/inputmethod.gni")
import("//build/ohos.gni")
config("inputmethodengine_native_config") {
@@ -25,7 +25,7 @@ config("inputmethodengine_native_public_config") {
ohos_shared_library("inputmethodengine") {
sources = [
"//base/miscservices/inputmethod/services/src/global.cpp",
"//base/inputmethod/imf/services/src/global.cpp",
"src/input_method_engine_module.cpp",
"src/js_input_method_engine.cpp",
"src/js_input_method_engine_listener.cpp",
@@ -43,8 +43,8 @@ ohos_shared_library("inputmethodengine") {
"${ability_runtime_inner_api_path}/app_manager:app_manager",
"${ability_runtime_path}/frameworks/native/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",
"//base/inputmethod/imf/frameworks/inputmethod_ability:inputmethod_ability",
"//base/inputmethod/imf/services:inputmethod_service",
"//foundation/arkui/napi/:ace_napi",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
@@ -66,6 +66,6 @@ ohos_shared_library("inputmethodengine") {
public_configs = [ ":inputmethodengine_native_public_config" ]
relative_install_dir = "module"
subsystem_name = "miscservices"
part_name = "inputmethod_native"
subsystem_name = "inputmethod"
part_name = "imf"
}
profile/BUILD.gn
+2 -2
View File
@@ -13,7 +13,7 @@
import("//build/ohos/sa_profile/sa_profile.gni")
ohos_sa_profile("miscservices_inputmethod_sa_profiles") {
ohos_sa_profile("inputmethod_inputmethod_sa_profiles") {
sources = [ "3703.xml" ]
part_name = "inputmethod_native"
part_name = "imf"
}
services/BUILD.gn
+7 -6
View File
@@ -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("//base/miscservices/inputmethod/inputmethod.gni")
import("//base/inputmethod/imf/inputmethod.gni")
import("//build/ohos.gni")
config("inputmethod_services_native_config") {
@@ -62,8 +62,8 @@ ohos_shared_library("inputmethod_service") {
"${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",
"//base/inputmethod/imf/etc/para:inputmethod_para",
"//base/inputmethod/imf/frameworks/inputmethod_ability:inputmethod_ability",
"//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr",
"//foundation/arkui/napi/:ace_napi",
"//foundation/arkui/napi/:ace_napi",
@@ -75,7 +75,8 @@ ohos_shared_library("inputmethod_service") {
"//utils/native/base:utils",
]
deps += [ "//base/miscservices/inputmethod/services/dialog/js:dialog_ime_js_files_etc" ]
deps +=
[ "//base/inputmethod/imf/services/dialog/js:dialog_ime_js_files_etc" ]
external_deps = [
"ability_base:want",
"bundle_framework:appexecfwk_base",
@@ -90,6 +91,6 @@ ohos_shared_library("inputmethod_service") {
"os_account:os_account_innerkits",
]
subsystem_name = "miscservices"
part_name = "inputmethod_native"
subsystem_name = "inputmethod"
part_name = "imf"
}
services/dialog/js/BUILD.gn
+3 -3
View File
@@ -13,13 +13,13 @@
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/"
project_path = "//base/inputmethod/imf/services/dialog/js/"
i18n_files = [
"i18n/en-US.json",
"i18n/zh-CN.json",
]
common_files = []
dialog_name = "input_method_choose_dialog"
part_name = "inputmethod_native"
subsystem_name = "miscservices"
part_name = "imf"
subsystem_name = "inputmethod"
}
test/fuzztest/BUILD.gn
+1 -1
View File
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/inputmethod/inputmethod.gni")
import("//base/inputmethod/imf/inputmethod.gni")
group("fuzztest") {
testonly = true
test/fuzztest/inputclientstub_fuzzer/BUILD.gn
+8 -8
View File
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/inputmethod/inputmethod.gni")
import("//base/inputmethod/imf/inputmethod.gni")
#####################hydra-fuzz###################
import("//build/config/features.gni")
@@ -20,15 +20,15 @@ import("//build/test.gni")
##############################fuzztest##########################################
ohos_fuzztest("InputClientStubFuzzTest") {
module_out_path = "miscservices/inputmethod"
module_out_path = "inputmethod/inputmethod"
fuzz_config_file =
"//base/miscservices/inputmethod/test/fuzztest/inputclientstub_fuzzer"
"//base/inputmethod/imf/test/fuzztest/inputclientstub_fuzzer"
include_dirs = [
"//base/miscservices/inputmethod/frameworks/inputmethod_controller/include",
"//base/miscservices/inputmethod/frameworks/inputmethod_ability/include",
"//base/miscservices/inputmethod/services/include",
"//base/inputmethod/imf/frameworks/inputmethod_controller/include",
"//base/inputmethod/imf/frameworks/inputmethod_ability/include",
"//base/inputmethod/imf/services/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//utils/native/base/include",
@@ -44,8 +44,8 @@ ohos_fuzztest("InputClientStubFuzzTest") {
sources = [ "inputclientstub_fuzzer.cpp" ]
deps = [
"//base/miscservices/inputmethod/frameworks/inputmethod_controller:inputmethod_client",
"//base/miscservices/inputmethod/services:inputmethod_service",
"//base/inputmethod/imf/frameworks/inputmethod_controller:inputmethod_client",
"//base/inputmethod/imf/services:inputmethod_service",
"//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",
unitest/BUILD.gn
+8 -8
View File
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/inputmethod/inputmethod.gni")
import("//base/inputmethod/imf/inputmethod.gni")
import("//build/test.gni")
config("module_private_config") {
@@ -20,7 +20,7 @@ config("module_private_config") {
include_dirs = [ "include" ]
}
module_output_path = "inputmethod_native/inputmethod_service"
module_output_path = "imf/inputmethod_service"
ohos_unittest("InputMethodControllerTest") {
module_out_path = module_output_path
@@ -32,9 +32,9 @@ ohos_unittest("InputMethodControllerTest") {
deps = [
"${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",
"//base/inputmethod/imf/frameworks/inputmethod_ability:inputmethod_ability",
"//base/inputmethod/imf/frameworks/inputmethod_controller:inputmethod_client",
"//base/inputmethod/imf/services:inputmethod_service",
"//foundation/arkui/napi/:ace_napi",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
@@ -60,9 +60,9 @@ ohos_unittest("InputMethodAbilityTest") {
deps = [
"${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",
"//base/inputmethod/imf/frameworks/inputmethod_ability:inputmethod_ability",
"//base/inputmethod/imf/frameworks/inputmethod_controller:inputmethod_client",
"//base/inputmethod/imf/services:inputmethod_service",
"//foundation/arkui/napi/:ace_napi",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",