!185 输入法框架编译整改需求

Merge pull request !185 from 赵凌岚/master

bundle.json

@@ -48,35 +48,26 @@
       ]
     },
     "build": {
-      "sub_component": [
-        "//base/inputmethod/imf:imf_packages"
-      ],
+      "group_type": {
+        "base_group": [
+        ],
+        "fwk_group": [
+          "//base/inputmethod/imf/frameworks/inputmethod_ability:inputmethod_ability",
+          "//base/inputmethod/imf/frameworks/inputmethod_controller:inputmethod_client",
+          "//base/inputmethod/imf/interfaces/kits/js/declaration:inputmethod",
+          "//base/inputmethod/imf/interfaces/kits/js/napi/inputmethod:inputmethod",
+          "//base/inputmethod/imf/interfaces/kits/js/napi/inputmethodengine:inputmethodengine",
+          "//base/inputmethod/imf/services/dfx:inputmethod_dfx_static"
+        ],
+        "service_group": [
+          "//base/inputmethod/imf/etc/init:inputmethodservice.cfg",
+          "//base/inputmethod/imf/etc/para:inputmethod.para",
+          "//base/inputmethod/imf/etc/para:inputmethod_para",
+          "//base/inputmethod/imf/profile:inputmethod_inputmethod_sa_profiles",
+          "//base/inputmethod/imf/services:inputmethod_service"
+        ]
+      },
       "inner_kits": [
-        {
-          "name": "//base/inputmethod/imf/services:inputmethod_service",
-          "header": {
-            "header_files": [
-              "global.h",
-              "input_attribute.h",
-              "input_channel.h",
-              "input_control_channel_proxy.h",
-              "input_control_channel_stub.h",
-              "input_method_ability_connection_stub.h",
-              "input_method_property.h",
-              "input_method_setting.h",
-              "input_method_system_ability.h",
-              "input_method_system_ability_stub.h",
-              "keyboard_type.h",
-              "message.h",
-              "message_handler.h",
-              "peruser_session.h",
-              "peruser_setting.h",
-              "platform.h",
-              "platform_callback_stub.h"
-            ],
-            "header_base": "//base/inputmethod/imf/services/include"
-          }
-        },
         {
           "name": "//base/inputmethod/imf/frameworks/inputmethod_controller:inputmethod_client",
           "header": {

frameworks/inputmethod_ability/BUILD.gn

@@ -10,6 +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/inputmethod/imf/inputmethod.gni")
 import("//build/ohos.gni")
 

frameworks/inputmethod_controller/BUILD.gn

@@ -10,6 +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/inputmethod/imf/inputmethod.gni")
 import("//build/ohos.gni")
 
@@ -40,9 +41,6 @@ config("inputmethod_client_native_public_config") {
 ohos_shared_library("inputmethod_client") {
   sources = [
     "${inputmethod_path}/frameworks/inputmethod_ability/src/input_method_agent_proxy.cpp",
-    "${inputmethod_path}/services/dfx/src/inputmethod_dump.cpp",
-    "${inputmethod_path}/services/dfx/src/inputmethod_sysevent.cpp",
-    "${inputmethod_path}/services/dfx/src/inputmethod_trace.cpp",
     "${inputmethod_path}/services/src/input_attribute.cpp",
     "${inputmethod_path}/services/src/input_method_property.cpp",
     "${inputmethod_path}/services/src/keyboard_type.cpp",
@@ -58,6 +56,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/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
@@ -66,12 +65,7 @@ ohos_shared_library("inputmethod_client") {
     "//utils/native/base:utils",
   ]
 
-  external_deps = [
-    "hisysevent_native:libhisysevent",
-    "hitrace_native:hitrace_meter",
-    "hitrace_native:libhitrace",
-    "hiviewdfx_hilog_native:libhilog",
-  ]
+  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
 
   configs = [ ":inputmethod_client_native_config" ]
 

interfaces/kits/js/napi/inputmethod/BUILD.gn

@@ -20,7 +20,11 @@ config("imf_config") {
 
 config("imf_public_config") {
   visibility = []
-  include_dirs = [ "include" ]
+  include_dirs = [
+    "include",
+    "${inputmethod_path}/frameworks/inputmethod_controller/include",
+    "${inputmethod_path}/services/dfx/include",
+  ]
 }
 
 ohos_shared_library("inputmethod") {
@@ -41,9 +45,9 @@ ohos_shared_library("inputmethod") {
     "${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",
-    "//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",

interfaces/kits/js/napi/inputmethodengine/BUILD.gn

@@ -20,7 +20,10 @@ config("inputmethodengine_native_config") {
 
 config("inputmethodengine_native_public_config") {
   visibility = []
-  include_dirs = [ "include" ]
+  include_dirs = [
+    "include",
+    "${inputmethod_path}/frameworks/inputmethod_controller/include",
+  ]
 }
 
 ohos_shared_library("inputmethodengine") {
@@ -44,7 +47,6 @@ ohos_shared_library("inputmethodengine") {
     "${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",
-    "//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",

services/BUILD.gn

@@ -10,6 +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/inputmethod/imf/inputmethod.gni")
 import("//build/ohos.gni")
 
@@ -17,11 +18,11 @@ config("inputmethod_services_native_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "include",
-    "dfx/include",
     "${inputmethod_path}/frameworks/inputmethod_ability/include",
     "${inputmethod_path}/frameworks/inputmethod_controller/include",
     "//base/notification/common_event_service/frameworks/core/include",
     "//base/notification/common_event_service/interfaces/innerkits/native/include",
+    "${inputmethod_path}/services/dfx/include",
   ]
 
   cflags_cc = [ "-fexceptions" ]
@@ -30,9 +31,6 @@ config("inputmethod_services_native_config") {
 ohos_shared_library("inputmethod_service") {
   sources = [
     "${inputmethod_path}/frameworks/inputmethod_controller/src/input_client_proxy.cpp",
-    "dfx/src/inputmethod_dump.cpp",
-    "dfx/src/inputmethod_sysevent.cpp",
-    "dfx/src/inputmethod_trace.cpp",
     "src/global.cpp",
     "src/im_common_event_manager.cpp",
     "src/input_attribute.cpp",
@@ -61,6 +59,7 @@ ohos_shared_library("inputmethod_service") {
     "${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",
@@ -84,9 +83,6 @@ ohos_shared_library("inputmethod_service") {
     "common_event_service:cesfwk_core",
     "common_event_service:cesfwk_innerkits",
     "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hitrace_native:hitrace_meter",
-    "hitrace_native:libhitrace",
     "hiviewdfx_hilog_native:libhilog",
     "os_account:os_account_innerkits",
   ]

services/dfx/BUILD.gn

@@ -0,0 +1,45 @@
+# Copyright (c) 2021-2022 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.
+
+import("//base/inputmethod/imf/inputmethod.gni")
+import("//build/ohos.gni")
+
+ohos_static_library("inputmethod_dfx_static") {
+  sources = [
+    "src/inputmethod_dump.cpp",
+    "src/inputmethod_sysevent.cpp",
+    "src/inputmethod_trace.cpp",
+  ]
+
+  include_dirs = [
+    "include",
+    "${inputmethod_path}/services/include",
+  ]
+
+  deps = [
+    "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
+    "//foundation/communication/ipc/interfaces/innerkits/ipc_single:ipc_single",
+    "//utils/native/base:utils",
+  ]
+
+  cflags_cc = [ "-fvisibility=hidden" ]
+
+  external_deps = [
+    "hisysevent_native:libhisysevent",
+    "hitrace_native:hitrace_meter",
+    "hitrace_native:libhitrace",
+    "hiviewdfx_hilog_native:libhilog",
+  ]
+  subsystem_name = "inputmethod"
+  part_name = "imf"
+}