From f6fcffd088e649815b2a179a16f91ba632c02049 Mon Sep 17 00:00:00 2001 From: zhouyongfei Date: Wed, 19 Jan 2022 11:56:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B8=B8=E9=A9=BB?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=B8=BAcfg=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouyongfei --- BUILD.gn | 2 +- etc/init/BUILD.gn | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 96ff75a36..7203b1bcf 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -18,7 +18,7 @@ import("//build/ohos.gni") group("inputmethod_native_packages") { if (is_standard_system) { deps = [ - "etc/init:inputmethodservice.rc", + "etc/init:inputmethodservice.cfg", "frameworks/inputmethod_ability:inputmethod_ability", "frameworks/inputmethod_controller:inputmethod_client", "interfaces/kits/js/declaration:inputmethod", diff --git a/etc/init/BUILD.gn b/etc/init/BUILD.gn index 09f7e6275..ddfdbb063 100644 --- a/etc/init/BUILD.gn +++ b/etc/init/BUILD.gn @@ -15,12 +15,8 @@ import("//build/ohos.gni") ################################################################################ -ohos_prebuilt_etc("inputmethodservice.rc") { - if (use_musl) { - source = "inputmethodservice.cfg" - } else { - source = "inputmethodservice.rc" - } +ohos_prebuilt_etc("inputmethodservice.cfg") { + source = "inputmethodservice.cfg" relative_install_dir = "init" part_name = "inputmethod_native" subsystem_name = "miscservices" -- Gitee From 6f193074811237a8de0fb26ccfaac44a70cb04cb Mon Sep 17 00:00:00 2001 From: zhouyongfei Date: Wed, 19 Jan 2022 14:07:19 +0800 Subject: [PATCH 2/2] format gn file Signed-off-by: zhouyongfei --- etc/init/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/init/BUILD.gn b/etc/init/BUILD.gn index ddfdbb063..c34044a1c 100644 --- a/etc/init/BUILD.gn +++ b/etc/init/BUILD.gn @@ -20,4 +20,4 @@ ohos_prebuilt_etc("inputmethodservice.cfg") { relative_install_dir = "init" part_name = "inputmethod_native" subsystem_name = "miscservices" -} \ No newline at end of file +} -- Gitee