提交 6b4ac154 编写于 作者: M Mupceet

fix build

Signed-off-by: NMupceet <laiguizhong@huawei.com>
上级 8d34a205
...@@ -37,6 +37,7 @@ ohos_shared_library("deviceinfoservice") { ...@@ -37,6 +37,7 @@ ohos_shared_library("deviceinfoservice") {
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init_lite/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/include/syspara", "//base/startup/init_lite/interfaces/innerkits/include/syspara",
"//base/startup/init_lite/interfaces/innerkits/syspara", "//base/startup/init_lite/interfaces/innerkits/syspara",
"//base/startup/init_lite/interfaces/hals",
] ]
deps = [ deps = [
......
...@@ -29,22 +29,22 @@ config("exported_header_files") { ...@@ -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)) { if (defined(ohos_lite)) {
import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/component/lite_component.gni")
import("//build/lite/ndk/ndk.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") { if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "linux") {
shared_library("libbegetutil") { shared_library("libbegetutil") {
sources = [ "//base/startup/init_lite/services/log/init_log.c" ] sources = [ "//base/startup/init_lite/services/log/init_log.c" ]
...@@ -167,15 +167,7 @@ if (defined(ohos_lite)) { ...@@ -167,15 +167,7 @@ if (defined(ohos_lite)) {
defines += [ "SUPPORT_64BIT" ] defines += [ "SUPPORT_64BIT" ]
} }
include_dirs = [ include_dirs = include_common
"./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",
]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits/sandbox:libsandbox", "//base/startup/init_lite/interfaces/innerkits/sandbox:libsandbox",
"//base/startup/init_lite/services/loopevent:loopevent", "//base/startup/init_lite/services/loopevent:loopevent",
...@@ -209,17 +201,7 @@ if (defined(ohos_lite)) { ...@@ -209,17 +201,7 @@ if (defined(ohos_lite)) {
"service_watcher/service_watcher.c", "service_watcher/service_watcher.c",
] ]
include_dirs = [ include_dirs = include_common
"./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",
]
deps = [ deps = [
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init_lite/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
...@@ -305,16 +287,7 @@ if (defined(ohos_lite)) { ...@@ -305,16 +287,7 @@ if (defined(ohos_lite)) {
defines += [ "SUPPORT_64BIT" ] defines += [ "SUPPORT_64BIT" ]
} }
include_dirs = [ include_dirs = include_common
"./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",
]
deps = [ deps = [
"//base/startup/init_lite/services/loopevent:loopevent", "//base/startup/init_lite/services/loopevent:loopevent",
"//base/startup/init_lite/services/param:param_client", "//base/startup/init_lite/services/param:param_client",
......
...@@ -52,48 +52,6 @@ param_include_dirs = [ ...@@ -52,48 +52,6 @@ param_include_dirs = [
"//utils/native/lite/include", "//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)) { if (defined(ohos_lite)) {
param_build_defines = [ param_build_defines = [
"_GNU_SOURCE", "_GNU_SOURCE",
...@@ -105,6 +63,48 @@ if (defined(ohos_lite)) { ...@@ -105,6 +63,48 @@ if (defined(ohos_lite)) {
"BUILD_ROOTHASH=\"${ohos_build_roothash}\"", "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") { static_library("param_init") {
defines = [] defines = []
deps = [] deps = []
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册