diff --git a/bundle.json b/bundle.json index cf2c9933ec771c0651d7a5e771c6c9b379b32783..703204156c574a22d63d7701f9889ff91b67728e 100644 --- a/bundle.json +++ b/bundle.json @@ -25,7 +25,8 @@ "hisysevent", "hilog", "napi", - "init" + "init", + "bounds_checking_function" ], "third_party": [ "bounds_checking_function" @@ -44,6 +45,15 @@ ] }, "name": "//base/customization/config_policy/frameworks/config_policy:configpolicy_util" + }, + { + "header": { + "header_base": "//base/customization/config_policy/interfaces/inner_api/include", + "header_files": [ + "config_policy_utils.h" + ] + }, + "name": "//base/customization/config_policy/frameworks/config_policy:configpolicy_util_for_init_static" } ], "test": [ diff --git a/frameworks/config_policy/BUILD.gn b/frameworks/config_policy/BUILD.gn index 978cbc6e6ce811b21f0a4d19461399fbe228963c..544564497df1829f37166f0a6d283a0b140d42b9 100644 --- a/frameworks/config_policy/BUILD.gn +++ b/frameworks/config_policy/BUILD.gn @@ -22,7 +22,13 @@ config_policy_sources = [ "src/config_policy_utils.c" ] config("config_policy_config") { include_dirs = [ "../../interfaces/inner_api/include", - "//third_party/bounds_checking_function/include", + "$TEL_CORESERVICE_ROOT_DIR/utils/common/include", + ] +} + +config("config_policy_config_for_static") { + include_dirs = [ + "../../interfaces/inner_api/include", "$STARTUP_INIT_ROOT_DIR/interfaces/innerkits/include/param", "$TEL_CORESERVICE_ROOT_DIR/utils/common/include", ] @@ -35,26 +41,27 @@ if (defined(ohos_lite) && ohos_kernel_type == "liteos_m") { print("cust config_policy_fs_prefix: ${config_policy_fs_prefix}") defines = [ "ROOT_PREFIX=\"${config_policy_fs_prefix}\"" ] } - include_dirs = [ - "../../interfaces/inner_api/include", - "//third_party/bounds_checking_function/include", - ] + include_dirs = [ "../../interfaces/inner_api/include" ] + external_deps = [ "bounds_checking_function:libsec_shared" ] } } else if (defined(ohos_lite)) { shared_library("configpolicy_util") { sources = config_policy_sources public_configs = [ ":config_policy_config" ] - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + external_deps = [ + "bounds_checking_function:libsec_shared", + "init:libbegetutil", + ] } } else { ohos_shared_library("configpolicy_util") { sources = config_policy_sources public_configs = [ ":config_policy_config" ] - deps = [ - "etc:customization_etc", - "//third_party/bounds_checking_function:libsec_shared", + deps = [ "etc:customization_etc" ] + external_deps = [ + "bounds_checking_function:libsec_shared", + "init:libbegetutil", ] - external_deps = [ "init:libbegetutil" ] install_images = [ "system", "updater", @@ -69,8 +76,9 @@ if (defined(ohos_lite) && ohos_kernel_type == "liteos_m") { } ohos_static_library("configpolicy_util_for_init_static") { sources = config_policy_sources - public_configs = [ ":config_policy_config" ] + public_configs = [ ":config_policy_config_for_static" ] subsystem_name = "customization" part_name = "config_policy" + external_deps = [ "bounds_checking_function:libsec_shared" ] } } diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 2ef63286431b4ec1d21bcd01faf8e7fcfcf17ee3..215ed48a60b739c578373e60f7eebf63d156938b 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -17,7 +17,6 @@ ohos_shared_library("configpolicy") { include_dirs = [ "include", "../../../interfaces/inner_api/include", - "//third_party/bounds_checking_function/include", "../../../frameworks/dfx/hisysevent_adapter", ] @@ -28,6 +27,7 @@ ohos_shared_library("configpolicy") { deps = [ "../../../frameworks/config_policy:configpolicy_util" ] external_deps = [ + "bounds_checking_function:libsec_shared", "hilog:libhilog", "hisysevent:libhisysevent", "napi:ace_napi",