diff --git a/device_info/BUILD.gn b/device_info/BUILD.gn index cf3f2e244b9b3dd1c22851f03103229ec60a08ec..9ffb585df81c4dcf05a836d98340bc272f2d9fc6 100644 --- a/device_info/BUILD.gn +++ b/device_info/BUILD.gn @@ -37,6 +37,7 @@ ohos_shared_library("deviceinfoservice") { "//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init_lite/interfaces/innerkits/include/syspara", "//base/startup/init_lite/interfaces/innerkits/syspara", + "//base/startup/init_lite/interfaces/hals", ] deps = [ diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 68457ee1464925dc1b17e19cdac6547a19b50a61..bb86fb2b0831b3716691afdf55b0a470929901bb 100755 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -29,22 +29,22 @@ config("exported_header_files") { ] } +include_common = [ + "./include", + "//base/hiviewdfx/hilog_lite/interfaces/native/kits", + "//third_party/bounds_checking_function/include", + "//base/startup/init_lite/services/include", + "//base/startup/init_lite/services/include/param", + "//base/startup/init_lite/interfaces/innerkits/fd_holder", + "//base/startup/init_lite/services/param/include", + "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init_lite/interfaces/hals", +] + if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") import("//build/lite/ndk/ndk.gni") - include_common = [ - "./include", - "//base/hiviewdfx/hilog_lite/interfaces/native/kits", - "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/interfaces/innerkits/fd_holder", - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/hals", - ] - if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "linux") { shared_library("libbegetutil") { sources = [ "//base/startup/init_lite/services/log/init_log.c" ] @@ -167,15 +167,7 @@ if (defined(ohos_lite)) { defines += [ "SUPPORT_64BIT" ] } - include_dirs = [ - "./include", - "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/interfaces/innerkits/fd_holder", - "//base/startup/init_lite/interfaces/innerkits/include", - ] + include_dirs = include_common deps = [ "//base/startup/init_lite/interfaces/innerkits/sandbox:libsandbox", "//base/startup/init_lite/services/loopevent:loopevent", @@ -209,17 +201,7 @@ if (defined(ohos_lite)) { "service_watcher/service_watcher.c", ] - include_dirs = [ - "./include", - "//base/startup/init_lite/device_info", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/syspara", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/param/include", - "//third_party/bounds_checking_function/include", - ] - + include_dirs = include_common deps = [ "//base/startup/init_lite/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_shared", @@ -305,16 +287,7 @@ if (defined(ohos_lite)) { defines += [ "SUPPORT_64BIT" ] } - include_dirs = [ - "./include", - "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/include/syspara", - "//base/startup/init_lite/interfaces/innerkits/syspara", - ] + include_dirs = include_common deps = [ "//base/startup/init_lite/services/loopevent:loopevent", "//base/startup/init_lite/services/param:param_client", diff --git a/services/param/BUILD.gn b/services/param/BUILD.gn index a545f88a56e30cf58765532b94e2cb4ab8f4c2ae..385b1168c7a5fd86803c968a0767b4c78b583ee0 100755 --- a/services/param/BUILD.gn +++ b/services/param/BUILD.gn @@ -52,48 +52,6 @@ param_include_dirs = [ "//utils/native/lite/include", ] -if (enable_ohos_startup_init_feature_begetctl_liteos) { - action("lite_const_param_to") { - script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" - args = [ - "--source", - rebase_path( - "//base/startup/init_lite/services/etc_lite/param/ohos_const/ohos.para"), - "--dest_dir", - rebase_path("$root_out_dir/gen/init_lite/"), - "--priority", - "0", - ] - outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] - } - - action("lite_ohos_param_to") { - script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" - args = [ - "--source", - rebase_path("//base/startup/init_lite/services/etc/param/ohos.para"), - "--dest_dir", - rebase_path("$root_out_dir/gen/init_lite/"), - "--priority", - "0", - ] - outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] - } - - action("vendor_param_to") { - script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" - args = [ - "--source", - rebase_path("$ohos_product_adapter_dir/utils/sys_param/vendor.para"), - "--dest_dir", - rebase_path("$root_out_dir/gen/init_lite/"), - "--priority", - "1", - ] - outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] - } -} - if (defined(ohos_lite)) { param_build_defines = [ "_GNU_SOURCE", @@ -105,6 +63,48 @@ if (defined(ohos_lite)) { "BUILD_ROOTHASH=\"${ohos_build_roothash}\"", ] + if (enable_ohos_startup_init_feature_begetctl_liteos) { + action("lite_const_param_to") { + script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" + args = [ + "--source", + rebase_path( + "//base/startup/init_lite/services/etc_lite/param/ohos_const/ohos.para"), + "--dest_dir", + rebase_path("$root_out_dir/gen/init_lite/"), + "--priority", + "0", + ] + outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] + } + + action("lite_ohos_param_to") { + script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" + args = [ + "--source", + rebase_path("//base/startup/init_lite/services/etc/param/ohos.para"), + "--dest_dir", + rebase_path("$root_out_dir/gen/init_lite/"), + "--priority", + "0", + ] + outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] + } + + action("vendor_param_to") { + script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" + args = [ + "--source", + rebase_path("$ohos_product_adapter_dir/utils/sys_param/vendor.para"), + "--dest_dir", + rebase_path("$root_out_dir/gen/init_lite/"), + "--priority", + "1", + ] + outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] + } + } + static_library("param_init") { defines = [] deps = []