From 81c8f27133797a307d9df99759e1777d1a77677b Mon Sep 17 00:00:00 2001 From: Mupceet Date: Fri, 29 Apr 2022 07:57:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E9=80=82=E9=85=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=BD=92=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mupceet --- bundle.json | 3 ++- frameworks/config_policy/BUILD.gn | 4 ++-- frameworks/config_policy/src/config_policy_utils.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bundle.json b/bundle.json index c868d00..3491b3e 100644 --- a/bundle.json +++ b/bundle.json @@ -20,7 +20,8 @@ "deps": { "components": [ "hiviewdfx_hilog_native", - "napi" + "napi", + "init" ], "third_party": [ "bounds_checking_function" diff --git a/frameworks/config_policy/BUILD.gn b/frameworks/config_policy/BUILD.gn index 43f9694..e6c1e9e 100644 --- a/frameworks/config_policy/BUILD.gn +++ b/frameworks/config_policy/BUILD.gn @@ -22,7 +22,7 @@ config("config_policy_config") { include_dirs = [ "//base/customization/config_policy/interfaces/inner_api/include", "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/services/include", + "//base/startup/init_lite/services/include/param" ] } @@ -39,9 +39,9 @@ if (defined(ohos_lite)) { public_configs = [ ":config_policy_config" ] deps = [ "etc:customization_etc", - "//base/startup/init_lite/services/param:param_client", "//third_party/bounds_checking_function:libsec_static", ] + external_deps = [ "init:libbegetutil" ] subsystem_name = "customization" part_name = "config_policy" } diff --git a/frameworks/config_policy/src/config_policy_utils.c b/frameworks/config_policy/src/config_policy_utils.c index 1eda18f..dce0a93 100644 --- a/frameworks/config_policy/src/config_policy_utils.c +++ b/frameworks/config_policy/src/config_policy_utils.c @@ -20,7 +20,7 @@ #include "config_policy_impl.h" #ifndef OHOS_LITE -#include "param/sys_param.h" +#include "init_param.h" #endif void FreeCfgFiles(CfgFiles *res) -- Gitee From e857ebb6940204af5bccfb7d922a366f6408f62f Mon Sep 17 00:00:00 2001 From: Mupceet Date: Fri, 29 Apr 2022 17:30:30 +0800 Subject: [PATCH 2/2] fix:codestyle Signed-off-by: Mupceet --- frameworks/config_policy/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/config_policy/BUILD.gn b/frameworks/config_policy/BUILD.gn index e6c1e9e..d5ceabc 100644 --- a/frameworks/config_policy/BUILD.gn +++ b/frameworks/config_policy/BUILD.gn @@ -22,7 +22,7 @@ config("config_policy_config") { include_dirs = [ "//base/customization/config_policy/interfaces/inner_api/include", "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/services/include/param" + "//base/startup/init_lite/services/include/param", ] } -- Gitee