输入法部件改造支持独立编译

Signed-off-by: qianyong325 <qianyong15@h-partners.com>

bundle.json

@@ -59,7 +59,7 @@
               "resource_management",
               "screenlock_mgr",
               "cJSON",
-              "idl_tool"
+              "selinux_adapter"
           ]
       }, 
       "build": {

etc/para/BUILD.gn

@@ -16,12 +16,14 @@ import("//build/ohos.gni")
 
 ohos_prebuilt_etc("inputmethod.para") {
   source = "//base/inputmethod/imf/etc/para/inputmethod.para"
+  subsystem_name = "inputmethod"
   part_name = "imf"
   module_install_dir = "etc/param"
 }
 
 ohos_prebuilt_etc("inputmethod.para.dac") {
   source = "//base/inputmethod/imf/etc/para/inputmethod.para.dac"
+  subsystem_name = "inputmethod"
   part_name = "imf"
   module_install_dir = "etc/param"
 }

frameworks/js/napi/common/BUILD.gn

@@ -55,7 +55,9 @@ ohos_static_library("inputmethod_js_common") {
   public_configs = [ ":inputmethod_js_common_public_config" ]
   deps = [ "${inputmethod_path}/common:inputmethod_common" ]
   external_deps = [
+    "c_utils:utils",
     "eventhandler:libeventhandler",
+    "hilog:libhilog",
     "napi:ace_napi",
   ]
   subsystem_name = "inputmethod"

frameworks/js/napi/inputmethod_extension_ability/BUILD.gn

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
 import("//build/ohos.gni")
 
 es2abc_gen_abc("gen_inputmethod_extension_ability_abc") {

frameworks/js/napi/inputmethod_extension_context/BUILD.gn

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
 
 import("//build/ohos.gni")
 

frameworks/js/napi/inputmethodlist/BUILD.gn

@@ -11,9 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
 import("//build/ohos.gni")
-import("//foundation/arkui/ace_engine/ace_config.gni")
 
 es2abc_gen_abc("gen_inputmethodlist_abc") {
   src_js = rebase_path("inputmethodlist.js")

frameworks/native/inputmethod_controller/include/input_data_channel_service_impl.h

@@ -16,8 +16,6 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_IMPL_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_IMPL_H
 
-#include "system_ability.h"
-
 #include "iinput_data_channel.h"
 #include "input_data_channel_stub.h"
 #include "iremote_object.h"

inputmethod.gni

@@ -19,14 +19,6 @@ innerkits_path = "${inputmethod_path}/interfaces/innerkits"
 
 adapter_path = "${inputmethod_path}/adapter"
 
-windowmanager_path = "//foundation/window/window_manager"
-
-bundllemanager_path = "//foundation/bundlemanager/bundle_framework"
-
-multimodalinput_path = "//foundation/multimodalinput/input"
-
-startup_init_path = "//base/startup/init"
-
 declare_args() {
   imf_screenlock_mgr_enable = false
   if (defined(global_parts_info) &&

interfaces/inner_api/inputmethod_ability/BUILD.gn

@@ -340,10 +340,13 @@ ohos_shared_library("inputmethod_ability") {
     "ability_base:configuration",
     "ability_base:want",
     "ability_runtime:ability_context_native",
+    "ability_runtime:runtime",
     "bundle_framework:appexecfwk_base",
+    "cJSON:cjson",
     "c_utils:utils",
     "config_policy:configpolicy_util",
     "eventhandler:libeventhandler",
+    "graphic_2d:librender_service_base",
     "graphic_2d:librender_service_client",
     "graphic_2d:window_animation",
     "hilog:libhilog",
@@ -462,7 +465,9 @@ ohos_static_library("inputmethod_ability_static") {
     "ability_base:configuration",
     "ability_base:want",
     "ability_runtime:ability_context_native",
+    "ability_runtime:runtime",
     "bundle_framework:appexecfwk_base",
+    "cJSON:cjson",
     "c_utils:utils",
     "config_policy:configpolicy_util",
     "eventhandler:libeventhandler",

seccomp_policy/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//base/inputmethod/imf/inputmethod.gni")
 import(
-    "${startup_init_path}/services/modules/seccomp/scripts/seccomp_policy_fixer.gni")
+    "//build/config/components/init/seccomp/scripts/seccomp_policy_fixer.gni")
 
 ohos_prebuilt_seccomp("imf_ext_secure_filter") {
   sources = [ "imf_ext_secure_mode.seccomp.policy" ]

services/BUILD.gn

@@ -108,6 +108,7 @@ ohos_shared_library("inputmethod_service") {
     "access_token:libtokenid_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
@@ -213,6 +214,7 @@ ohos_static_library("inputmethod_service_static") {
     "access_token:libtokenid_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",

services/adapter/keyboard/BUILD.gn

@@ -42,6 +42,7 @@ ohos_static_library("keboard_event_static") {
   cflags_cc = [ "-fvisibility=hidden" ]
 
   external_deps = [
+    "c_utils:utils",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "input:libmmi-client",

services/adapter/settings_data_provider/BUILD.gn

@@ -51,7 +51,9 @@ ohos_static_library("settings_data_static") {
   external_deps = [
     "ability_base:zuri",
     "ability_runtime:dataobs_manager",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "config_policy:configpolicy_util",
     "data_share:datashare_common",

test/fuzztest/agentstub_fuzzer/BUILD.gn

@@ -43,6 +43,7 @@ ohos_fuzztest("AgentStubFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "graphic_2d:librender_service_base",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",

test/fuzztest/corestub_fuzzer/BUILD.gn

@@ -44,6 +44,7 @@ ohos_fuzztest("CoreStubFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "graphic_2d:librender_service_base",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",

test/fuzztest/imfhisyseventreport_fuzzer/BUILD.gn

@@ -58,6 +58,7 @@ ohos_fuzztest("ImfHisyseventReportFuzzTest") {
     "hisysevent:libhisysevent",
     "hisysevent:libhisyseventmanager",
     "input:libmmi-client",
+    "ipc:ipc_core",
   ]
 }
 

test/fuzztest/inputclientstub_fuzzer/BUILD.gn

@@ -48,6 +48,7 @@ ohos_fuzztest("InputClientStubFuzzTest") {
   external_deps = [
     "ability_runtime:ability_manager",
     "c_utils:utils",
+    "graphic_2d:librender_service_base",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",

test/fuzztest/inputmethodability_fuzzer/BUILD.gn

@@ -46,6 +46,7 @@ ohos_fuzztest("InputMethodAbilityFuzzTest") {
 
   external_deps = [
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "c_utils:utils",
     "hilog:libhilog",
     "input:libmmi-client",

test/fuzztest/inputmethodsystemability_fuzzer/BUILD.gn

@@ -55,6 +55,7 @@ ohos_fuzztest("InputmethodSystemAbilityFuzzTest") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",

test/fuzztest/perusersession_fuzzer/BUILD.gn

@@ -52,9 +52,12 @@ ohos_fuzztest("PerUserSessionFuzzTest") {
 
   external_deps = [
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "graphic_2d:librender_service_base",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",

test/fuzztest/settingsdatautils_fuzzer/BUILD.gn

@@ -54,7 +54,9 @@ ohos_fuzztest("SettingsDataUtilsFuzzTest") {
   external_deps = [
     "ability_base:zuri",
     "ability_runtime:dataobs_manager",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",

test/fuzztest/systemabilitystub_fuzzer/BUILD.gn

@@ -55,6 +55,7 @@ ohos_fuzztest("SystemAbilityStubFuzzTest") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
@@ -64,6 +65,11 @@ ohos_fuzztest("SystemAbilityStubFuzzTest") {
     "safwk:system_ability_fwk",
     "window_manager:libdm_lite",
   ]
+
+  if (build_selinux) {
+    external_deps += [ "selinux_adapter:librestorecon" ]
+    cflags += [ "-DWITH_SELINUX" ]
+  }
 }
 
 ###############################################################################

test/fuzztest/systemabilitystubfuzztest/BUILD.gn

@@ -70,14 +70,20 @@ common_external_deps = [
   "ability_runtime:ability_manager",
   "access_token:libaccesstoken_sdk",
   "bundle_framework:appexecfwk_core",
+  "cJSON:cjson",
   "data_share:datashare_common",
   "data_share:datashare_consumer",
+  "graphic_2d:librender_service_base",
   "hilog:libhilog",
   "input:libmmi-client",
   "safwk:system_ability_fwk",
   "window_manager:libdm_lite",
 ]
 
+if (build_selinux) {
+  common_external_deps += [ "selinux_adapter:librestorecon" ]
+}
+
 common_deps = [
   "${inputmethod_path}/interfaces/inner_api/inputmethod_ability:inputmethod_ability_static",
   "${inputmethod_path}/services:inputmethod_service_static",

test/fuzztest/systemabilitystubfuzztest/common/BUILD.gn

@@ -57,6 +57,7 @@ ohos_static_library("imf_sa_stub_fuzztest_common_static") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",

test/unittest/cpp_test/BUILD.gn

@@ -64,20 +64,23 @@ ohos_unittest("InputMethodControllerTest") {
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "config_policy:configpolicy_util",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
+    "graphic_2d:librender_service_base",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -92,6 +95,11 @@ ohos_unittest("InputMethodControllerTest") {
   } else {
     external_deps += [ "window_manager:libwm" ]
   }
+
+  if (build_selinux) {
+    external_deps += [ "selinux_adapter:librestorecon" ]
+    cflags = [ "-DWITH_SELINUX" ]
+  }
 }
 
 ohos_unittest("InputMethodAttachTest") {
@@ -125,19 +133,21 @@ ohos_unittest("InputMethodAttachTest") {
     "${inputmethod_path}/services/json:imf_json_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gmock",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gmock",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "napi:ace_napi",
@@ -189,19 +199,21 @@ ohos_unittest("InputMethodAbilityTest") {
     "${inputmethod_path}/services/json:imf_json_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "graphic_2d:librender_service_client",
     "graphic_2d:window_animation",
     "hilog:libhilog",
@@ -241,7 +253,6 @@ ohos_unittest("InputMethodServiceTest") {
     "${inputmethod_path}/services:inputmethod_service",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -249,7 +260,9 @@ ohos_unittest("InputMethodServiceTest") {
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
     "access_token:libaccesstoken_sdk",
+    "cJSON:cjson",
     "c_utils:utils",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -297,19 +310,22 @@ ohos_unittest("InputMethodDfxTest") {
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
+    "graphic_2d:librender_service_base",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hisysevent:libhisyseventmanager",
@@ -357,20 +373,23 @@ ohos_unittest("InputMethodPanelTest") {
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
+    "graphic_2d:librender_service_base",
     "graphic_2d:librender_service_client",
     "graphic_2d:window_animation",
     "hilog:libhilog",
@@ -426,11 +445,14 @@ ohos_unittest("InputMethodPanelAdjustTest") {
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "googletest:gtest_main",
+    "graphic_2d:librender_service_base",
     "graphic_2d:librender_service_client",
     "graphic_2d:window_animation",
     "hilog:libhilog",
@@ -477,15 +499,17 @@ ohos_unittest("InputMethodSwitchTest") {
     "${inputmethod_path}/services/adapter/settings_data_provider:settings_data_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "access_token:libaccesstoken_sdk",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "safwk:system_ability_fwk",
@@ -496,6 +520,11 @@ ohos_unittest("InputMethodSwitchTest") {
   } else {
     external_deps += [ "window_manager:libwm" ]
   }
+
+  if (build_selinux) {
+    external_deps += [ "selinux_adapter:librestorecon" ]
+    cflags = [ "-DWITH_SELINUX" ]
+  }
 }
 
 ohos_unittest("ITypesUtilTest") {
@@ -534,16 +563,18 @@ ohos_unittest("ITypesUtilTest") {
     "${inputmethod_path}/interfaces/inner_api/inputmethod_controller:inputmethod_client_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "bundle_framework:appexecfwk_base",
     "c_utils:utils",
+    "googletest:gtest_main",
     "hilog:libhilog",
+    "image_framework:image_native",
     "input:libmmi-client",
     "ipc:ipc_single",
     "napi:ace_napi",
@@ -592,17 +623,19 @@ ohos_unittest("InputMethodPrivateMemberTest") {
     "${inputmethod_path}/interfaces/inner_api/inputmethod_controller:inputmethod_client_static",
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_core",
@@ -651,19 +684,21 @@ ohos_unittest("InputMethodEditorTest") {
     "${inputmethod_path}/services/json:imf_json_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -708,15 +743,17 @@ ohos_unittest("NewImeSwitchTest") {
     "${inputmethod_path}/services/adapter/settings_data_provider:settings_data_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "access_token:libaccesstoken_sdk",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "safwk:system_ability_fwk",
@@ -727,6 +764,11 @@ ohos_unittest("NewImeSwitchTest") {
   } else {
     external_deps += [ "window_manager:libwm" ]
   }
+
+  if (build_selinux) {
+    external_deps += [ "selinux_adapter:librestorecon" ]
+    cflags = [ "-DWITH_SELINUX" ]
+  }
 }
 
 ohos_unittest("IdentityCheckerTest") {
@@ -753,7 +795,6 @@ ohos_unittest("IdentityCheckerTest") {
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -762,9 +803,11 @@ ohos_unittest("IdentityCheckerTest") {
     "ability_runtime:ability_manager",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -806,8 +849,6 @@ ohos_unittest("TextListenerInnerApiTest") {
     "${inputmethod_path}/services:inputmethod_service",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gmock",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -818,6 +859,8 @@ ohos_unittest("TextListenerInnerApiTest") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
+    "googletest:gmock",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -886,6 +929,7 @@ ohos_unittest("ImeProxyAgentImeTest") {
     "input:libmmi-client",
     "ipc:ipc_single",
     "napi:ace_napi",
+    "samgr:samgr_proxy",
     "window_manager:libdm",
   ]
 
@@ -894,6 +938,11 @@ ohos_unittest("ImeProxyAgentImeTest") {
   } else {
     external_deps += [ "window_manager:libwm" ]
   }
+
+  if (build_selinux) {
+    external_deps += [ "selinux_adapter:librestorecon" ]
+    cflags = [ "-DWITH_SELINUX" ]
+  }
 }
 
 ohos_unittest("ImeProxyTest") {
@@ -929,16 +978,17 @@ ohos_unittest("ImeProxyTest") {
     "${inputmethod_path}/test/unittest/resource/bundle_dependencies/editorBox:editorBox",
     "${inputmethod_path}/test/unittest/resource/bundle_dependencies/extImfBundle:extImf",
     "${inputmethod_path}/test/unittest/resource/ohos_test:copy_ohos_test",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gtest_main",
     "graphic_2d:librender_service_client",
     "graphic_2d:window_animation",
     "hilog:libhilog",
@@ -954,6 +1004,10 @@ ohos_unittest("ImeProxyTest") {
   } else {
     external_deps += [ "window_manager:libwm" ]
   }
+  if (build_selinux) {
+    external_deps += [ "selinux_adapter:librestorecon" ]
+    cflags = [ "-DWITH_SELINUX" ]
+  }
 }
 
 ohos_unittest("TaskManagerTest") {
@@ -977,13 +1031,13 @@ ohos_unittest("TaskManagerTest") {
     "${inputmethod_path}/interfaces/inner_api/inputmethod_ability:inputmethod_ability",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "hilog:libhilog",
   ]
 }
@@ -1009,7 +1063,6 @@ ohos_unittest("ImeFreezeManagerTest") {
   deps = [
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -1017,10 +1070,12 @@ ohos_unittest("ImeFreezeManagerTest") {
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_core",
@@ -1052,14 +1107,15 @@ ohos_unittest("JsonOperateTest") {
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/services/adapter/settings_data_provider:settings_data_static",
     "${inputmethod_path}/services/json:imf_json_static",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -1085,8 +1141,6 @@ ohos_unittest("VirtualListenerTest") {
     "${inputmethod_path}/interfaces/inner_api/inputmethod_controller:inputmethod_client_static",
     "${inputmethod_path}/services:inputmethod_service",
     "${inputmethod_path}/test/common:inputmethod_test_common",
-    "//third_party/googletest:gmock",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -1097,6 +1151,8 @@ ohos_unittest("VirtualListenerTest") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
+    "googletest:gmock",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -1135,7 +1191,6 @@ ohos_unittest("ImeSystemChannelTest") {
     "${inputmethod_path}/services:inputmethod_service",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -1146,6 +1201,7 @@ ohos_unittest("ImeSystemChannelTest") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -1206,6 +1262,7 @@ ohos_unittest("ImeControllerCpaiTest") {
 
   external_deps = [
     "googletest:gtest_main",
+    "hilog:libhilog",
     "input:libmmi-client",
   ]
 }
@@ -1288,14 +1345,17 @@ ohos_unittest("InputMethodMessageHandlerTest") {
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "config_policy:configpolicy_util",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
     "googletest:gtest_main",
+    "graphic_2d:librender_service_base",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -1368,6 +1428,7 @@ ohos_unittest("ImfHisysEventReporterTest") {
     "hisysevent:libhisysevent",
     "hisysevent:libhisyseventmanager",
     "input:libmmi-client",
+    "ipc:ipc_core",
   ]
 }
 
@@ -1445,4 +1506,9 @@ ohos_unittest("ImeEnabledInfoManagerTest") {
   } else {
     external_deps += [ "window_manager:libwm" ]
   }
+
+  if (build_selinux) {
+    external_deps += [ "selinux_adapter:librestorecon" ]
+    cflags = [ "-DWITH_SELINUX" ]
+  }
 }

test/unittest/cpp_test/common/BUILD.gn

@@ -29,7 +29,6 @@ config("inputmethod_tdd_util_public_config") {
   visibility = [ "./*" ]
   include_dirs = [
     "include",
-    "${bundllemanager_path}/interfaces/inner_api/appexecfwk_core/include/bundlemgr",
     "${inputmethod_path}/services/adapter/settings_data_provider/common/include",
   ]
 }
@@ -59,6 +58,7 @@ ohos_static_library("inputmethod_tdd_util") {
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "cJSON:cjson",
     "data_share:datashare_common",

test/unittest/cpp_test/common/include/tdd_util.h

@@ -20,7 +20,7 @@
 
 #include "block_data.h"
 #include "bundle_mgr_interface.h"
-#include "foundation/window/window_manager/interfaces/innerkits/wm/window.h"
+#include "window.h"
 #include "window_manager.h"
 #include "window_option.h"
 #include "wm_common.h"