提交 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,11 +29,7 @@ config("exported_header_files") { ...@@ -29,11 +29,7 @@ config("exported_header_files") {
] ]
} }
if (defined(ohos_lite)) { include_common = [
import("//build/lite/config/component/lite_component.gni")
import("//build/lite/ndk/ndk.gni")
include_common = [
"./include", "./include",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits", "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
...@@ -43,7 +39,11 @@ if (defined(ohos_lite)) { ...@@ -43,7 +39,11 @@ if (defined(ohos_lite)) {
"//base/startup/init_lite/services/param/include", "//base/startup/init_lite/services/param/include",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init_lite/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/hals", "//base/startup/init_lite/interfaces/hals",
] ]
if (defined(ohos_lite)) {
import("//build/lite/config/component/lite_component.gni")
import("//build/lite/ndk/ndk.gni")
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") {
...@@ -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,7 +52,18 @@ param_include_dirs = [ ...@@ -52,7 +52,18 @@ param_include_dirs = [
"//utils/native/lite/include", "//utils/native/lite/include",
] ]
if (enable_ohos_startup_init_feature_begetctl_liteos) { if (defined(ohos_lite)) {
param_build_defines = [
"_GNU_SOURCE",
"INCREMENTAL_VERSION=\"${ohos_version}\"",
"BUILD_TYPE=\"${ohos_build_type}\"",
"BUILD_USER=\"${ohos_build_user}\"",
"BUILD_TIME=\"${ohos_build_time}\"",
"BUILD_HOST=\"${ohos_build_host}\"",
"BUILD_ROOTHASH=\"${ohos_build_roothash}\"",
]
if (enable_ohos_startup_init_feature_begetctl_liteos) {
action("lite_const_param_to") { action("lite_const_param_to") {
script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" script = "//base/startup/init_lite/scripts/param_cfg_to_code.py"
args = [ args = [
...@@ -92,18 +103,7 @@ if (enable_ohos_startup_init_feature_begetctl_liteos) { ...@@ -92,18 +103,7 @@ if (enable_ohos_startup_init_feature_begetctl_liteos) {
] ]
outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ]
} }
} }
if (defined(ohos_lite)) {
param_build_defines = [
"_GNU_SOURCE",
"INCREMENTAL_VERSION=\"${ohos_version}\"",
"BUILD_TYPE=\"${ohos_build_type}\"",
"BUILD_USER=\"${ohos_build_user}\"",
"BUILD_TIME=\"${ohos_build_time}\"",
"BUILD_HOST=\"${ohos_build_host}\"",
"BUILD_ROOTHASH=\"${ohos_build_roothash}\"",
]
static_library("param_init") { static_library("param_init") {
defines = [] defines = []
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册