From abe9dd379679dedf5fe6a13f1327bc6eea724c63 Mon Sep 17 00:00:00 2001 From: yangqing Date: Thu, 8 Sep 2022 16:22:39 +0800 Subject: [PATCH] noused-independence2 Signed-off-by: yangqing --- etc/para/BUILD.gn | 5 +---- frameworks/inputmethod_ability/BUILD.gn | 12 +----------- frameworks/inputmethod_controller/BUILD.gn | 2 -- frameworks/kits/extension/BUILD.gn | 4 ---- interfaces/kits/js/napi/inputmethod/BUILD.gn | 10 ---------- interfaces/kits/js/napi/inputmethodengine/BUILD.gn | 12 ------------ services/BUILD.gn | 6 +----- 7 files changed, 3 insertions(+), 48 deletions(-) diff --git a/etc/para/BUILD.gn b/etc/para/BUILD.gn index 54a1cfe5..7ed37563 100644 --- a/etc/para/BUILD.gn +++ b/etc/para/BUILD.gn @@ -26,10 +26,7 @@ ohos_shared_library("inputmethod_para") { sources = [ "src/para_handle.cpp" ] configs = [ ":inputmethod_para_config" ] deps = [] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "init:libbegetutil", - ] + external_deps = [ "init:libbegetutil" ] public_configs = [ ":inputmethod_para_public_config" ] subsystem_name = "inputmethod" part_name = "imf" diff --git a/frameworks/inputmethod_ability/BUILD.gn b/frameworks/inputmethod_ability/BUILD.gn index 7547440e..446ddfdc 100644 --- a/frameworks/inputmethod_ability/BUILD.gn +++ b/frameworks/inputmethod_ability/BUILD.gn @@ -18,6 +18,7 @@ config("inputmethod_ability_native_config") { visibility = [ ":*" ] include_dirs = [ "include", + "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", "${inputmethod_path}/frameworks/inputmethod_controller/include", "${inputmethod_path}/interfaces/kits/js/napi/inputmethodengine/include", "${inputmethod_path}/services/include", @@ -52,23 +53,12 @@ ohos_shared_library("inputmethod_ability") { configs = [ ":inputmethod_ability_native_config" ] deps = [ - "${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", - "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] external_deps = [ - "ability_base:want", - "ability_runtime:runtime", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", - "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", ] diff --git a/frameworks/inputmethod_controller/BUILD.gn b/frameworks/inputmethod_controller/BUILD.gn index 520d9db6..3a05fa71 100644 --- a/frameworks/inputmethod_controller/BUILD.gn +++ b/frameworks/inputmethod_controller/BUILD.gn @@ -58,9 +58,7 @@ ohos_shared_library("inputmethod_client") { deps = [ "${inputmethod_path}/services/dfx:inputmethod_dfx_static", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common", - "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] diff --git a/frameworks/kits/extension/BUILD.gn b/frameworks/kits/extension/BUILD.gn index 36ef2acd..7bc1088d 100644 --- a/frameworks/kits/extension/BUILD.gn +++ b/frameworks/kits/extension/BUILD.gn @@ -118,12 +118,8 @@ ohos_shared_library("inputmethod_extension") { ] public_deps = [ - "//base/global/i18n/frameworks/intl:intl_util", - "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", - "//foundation/window/window_manager/interfaces/kits/napi/window_runtime:windowstage_kit", - "//foundation/window/window_manager/wm:libwm", ] subsystem_name = "inputmethod" diff --git a/interfaces/kits/js/napi/inputmethod/BUILD.gn b/interfaces/kits/js/napi/inputmethod/BUILD.gn index 9b7cda0a..ff103efa 100644 --- a/interfaces/kits/js/napi/inputmethod/BUILD.gn +++ b/interfaces/kits/js/napi/inputmethod/BUILD.gn @@ -42,26 +42,16 @@ ohos_shared_library("inputmethod") { 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", "${inputmethod_path}/services/dfx:inputmethod_dfx_static", - "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/inputmethod/imf/frameworks/inputmethod_ability:inputmethod_ability", "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] external_deps = [ - "ability_base:want", - "ability_runtime:runtime", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", - "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/interfaces/kits/js/napi/inputmethodengine/BUILD.gn b/interfaces/kits/js/napi/inputmethodengine/BUILD.gn index 3c5d8907..a10f93e1 100644 --- a/interfaces/kits/js/napi/inputmethodengine/BUILD.gn +++ b/interfaces/kits/js/napi/inputmethodengine/BUILD.gn @@ -42,25 +42,13 @@ ohos_shared_library("inputmethodengine") { configs = [ ":inputmethodengine_native_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/inputmethod/imf/frameworks/inputmethod_ability:inputmethod_ability", "//foundation/arkui/napi/:ace_napi", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] external_deps = [ - "ability_base:want", - "ability_runtime:runtime", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", - "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/BUILD.gn b/services/BUILD.gn index b016341d..2cf6af95 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -22,6 +22,7 @@ config("inputmethod_services_native_config") { "${inputmethod_path}/frameworks/inputmethod_controller/include", "//base/notification/common_event_service/frameworks/core/include", "//base/notification/common_event_service/interfaces/innerkits/native/include", + "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", "${inputmethod_path}/services/dfx/include", ] @@ -57,18 +58,13 @@ ohos_shared_library("inputmethod_service") { deps = [ "${ability_runtime_inner_api_path}/ability_manager:ability_manager", - "${ability_runtime_inner_api_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${inputmethod_path}/services/dfx:inputmethod_dfx_static", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//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", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ]