未验证 提交 7f0ac307 编写于 作者: O openharmony_ci 提交者: Gitee

!4737 FIX: 修改BUILD.gn

Merge pull request !4737 from Mupceet/syspara_0801
...@@ -26,7 +26,7 @@ hctest_suite("ActsKitFwkApiTest") { ...@@ -26,7 +26,7 @@ hctest_suite("ActsKitFwkApiTest") {
"//third_party/bounds_checking_function/include/", "//third_party/bounds_checking_function/include/",
"//third_party/mbedtls/include/", "//third_party/mbedtls/include/",
"//third_party/cJSON/", "//third_party/cJSON/",
"//base/startup/syspara_lite/interfaces/kits/", "//base/startup/init/interfaces/innerkits/include/syspara",
# dir for oem_auth_config.h and oem_auth_result_storage.h # dir for oem_auth_config.h and oem_auth_result_storage.h
"//vendor/kitframework/include/", "//vendor/kitframework/include/",
......
...@@ -24,7 +24,7 @@ executable("ActsKitFwkApiTest") { ...@@ -24,7 +24,7 @@ executable("ActsKitFwkApiTest") {
"//third_party/cJSON", "//third_party/cJSON",
"//third_party/mbedtls/include/", "//third_party/mbedtls/include/",
"//third_party/bounds_checking_function/include/", "//third_party/bounds_checking_function/include/",
"//base/startup/syspara_lite/interfaces/kits/", "//base/startup/init/interfaces/innerkits/include/syspara",
# dir for oem_auth_config.h and oem_auth_result_storage.h # dir for oem_auth_config.h and oem_auth_result_storage.h
"//vendor/kitframework/include/", "//vendor/kitframework/include/",
......
...@@ -59,9 +59,9 @@ hctest_suite("ActsSecurityHichainBasicDeps") { ...@@ -59,9 +59,9 @@ hctest_suite("ActsSecurityHichainBasicDeps") {
] ]
if (ohos_kernel_type == "liteos_m") { if (ohos_kernel_type == "liteos_m") {
# liteos m # liteos m
include_dirs += [ "//base/startup/syspara_lite/interfaces/kits" ] include_dirs +=
deps += [ "//base/startup/init/interfaces/innerkits/include/syspara" ]
[ "//base/startup/syspara_lite/frameworks/parameter/src:sysparam" ] deps += [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
if (board_name == "rtl8720") { if (board_name == "rtl8720") {
cflags += cflags +=
[ "-isystem${ohos_root_path}/kernel/liteos_m/kal/posix/include" ] [ "-isystem${ohos_root_path}/kernel/liteos_m/kal/posix/include" ]
...@@ -134,19 +134,17 @@ hctest_suite("ActsSecurityHichainBasicDeps") { ...@@ -134,19 +134,17 @@ hctest_suite("ActsSecurityHichainBasicDeps") {
} }
} else { } else {
#liteos a or L1 linux #liteos a or L1 linux
include_dirs += [ "//base/startup/syspara_lite/interfaces/kits" ] include_dirs +=
deps += [ "//base/startup/init/interfaces/innerkits/include/syspara" ]
[ "//base/startup/syspara_lite/frameworks/parameter/src:sysparam" ] deps += [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
} }
} else { } else {
# linux # linux
include_dirs += [ include_dirs += [
"//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", "//base/startup/init/interfaces/innerkits/include/syspara",
"//base/security/device_auth/deps_adapter/os_adapter/interfaces/linux", "//base/security/device_auth/deps_adapter/os_adapter/interfaces/linux",
] ]
deps += [ deps += [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
"//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara",
]
} }
} }
...@@ -23,7 +23,7 @@ hctest_suite("ActsParameterTest") { ...@@ -23,7 +23,7 @@ hctest_suite("ActsParameterTest") {
include_dirs = [ include_dirs = [
"src", "src",
"//base/startup/syspara_lite/interfaces/kits", "///base/startup/init/interfaces/innerkits/include/syspara",
] ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
} }
...@@ -19,10 +19,10 @@ hcpptest_suite("ActsParameterTest") { ...@@ -19,10 +19,10 @@ hcpptest_suite("ActsParameterTest") {
include_dirs = [ include_dirs = [
"src", "src",
"//base/startup/syspara_lite/interfaces/kits", "//base/startup/init/interfaces/innerkits/include/syspara",
] ]
deps = [ "//base/startup/syspara_lite/frameworks/parameter:parameter" ] deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
ldflags = [ ldflags = [
"-lstdc++", "-lstdc++",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册