!92 先使用顶层third_party, 后继再改用本仓库中的third_party

Merge pull request !92 from Caoruihong/top_third_party
This commit is contained in:
openharmony_ci 2021-04-26 21:23:14 +08:00 committed by Gitee
commit 4e568d1cbf
12 changed files with 19 additions and 18 deletions

View File

@ -34,6 +34,6 @@ static_library("backtrace") {
"../../kernel/include", "../../kernel/include",
"../../kernel/arch/include", "../../kernel/arch/include",
"../../utils", "../../utils",
"../../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
} }

View File

@ -34,6 +34,6 @@ static_library("cpup") {
"../../kernel/include", "../../kernel/include",
"../../kernel/arch/include", "../../kernel/arch/include",
"../../utils", "../../utils",
"../../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
} }

View File

@ -36,6 +36,6 @@ static_library("exchook") {
"../../kernel/arch/include", "../../kernel/arch/include",
"../../kernel/include", "../../kernel/include",
"../../utils", "../../utils",
"../../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
} }

View File

@ -29,10 +29,10 @@
static_library("fatfs") { static_library("fatfs") {
sources = [ sources = [
"../../../third_party/FatFs/source/diskio.c", "//third_party/FatFs/source/diskio.c",
"../../../third_party/FatFs/source/ff.c", "//third_party/FatFs/source/ff.c",
"../../../third_party/FatFs/source/ffsystem.c", "//third_party/FatFs/source/ffsystem.c",
"../../../third_party/FatFs/source/ffunicode.c", "//third_party/FatFs/source/ffunicode.c",
"fatfs.c", "fatfs.c",
"fs.c", "fs.c",
] ]
@ -43,7 +43,7 @@ static_library("fatfs") {
"../../../utils", "../../../utils",
"../../../kal/cmsis", "../../../kal/cmsis",
"../../../kal/posix/include", "../../../kal/posix/include",
"../../../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"../../../third_party/FatFs/source/", "//third_party/FatFs/source/",
] ]
} }

View File

@ -31,8 +31,8 @@ static_library("cmsis") {
sources = [ "cmsis_liteos2.c" ] sources = [ "cmsis_liteos2.c" ]
include_dirs = [ include_dirs = [
"../../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"../../third_party/cmsis/CMSIS/RTOS2/Include", "//third_party/cmsis/CMSIS/RTOS2/Include",
"../../kernel/include", "../../kernel/include",
"../../kernel/arch/include", "../../kernel/arch/include",
"../../utils", "../../utils",

View File

@ -45,6 +45,6 @@ static_library("posix") {
"../../kernel/arch/include", "../../kernel/arch/include",
"../../kernel/include", "../../kernel/include",
"../../utils", "../../utils",
"../../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
} }

View File

@ -47,7 +47,7 @@ static_library("kernel") {
"../components/cpup", "../components/cpup",
"../components/exchook", "../components/exchook",
"../utils", "../utils",
"../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
if ("$board_cpu" == "cortex-m3") { if ("$board_cpu" == "cortex-m3") {

View File

@ -40,6 +40,6 @@ static_library("arch") {
"../../../../../kernel/arch/include", "../../../../../kernel/arch/include",
"../../../../../kernel/include", "../../../../../kernel/include",
"../../../../../utils", "../../../../../utils",
"../../../../../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
} }

View File

@ -41,6 +41,6 @@ static_library("arch") {
"../../../../../kernel/arch/include", "../../../../../kernel/arch/include",
"../../../../../kernel/include", "../../../../../kernel/include",
"../../../../../utils", "../../../../../utils",
"../../../../../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
} }

View File

@ -40,6 +40,6 @@ static_library("arch") {
"../../../../../kernel/arch/include", "../../../../../kernel/arch/include",
"../../../../../kernel/include", "../../../../../kernel/include",
"../../../../../utils", "../../../../../utils",
"../../../../../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
} }

View File

@ -41,6 +41,6 @@ static_library("arch") {
"../../../../../kernel/include", "../../../../../kernel/include",
"../../../../../utils", "../../../../../utils",
"asm", "asm",
"../../../../../third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
} }

View File

@ -36,6 +36,7 @@ static_library("utils") {
include_dirs = [ include_dirs = [
"../kernel/include", "../kernel/include",
"../kernel/arch/include", "../kernel/arch/include",
"../third_party/bounds_checking_function/include", ".",
"//third_party/bounds_checking_function/include",
] ]
} }