!82 加入FatFs同时修正BUILD.gn中third_party路径

Merge pull request !82 from Caoruihong/fix_thirdparty_path

.gitmodules

 [submodule "third_party/cmsis"]
 	path = third_party/cmsis
-	url = ../third_party_cmsis.git
+	url = https://gitee.com/openharmony/third_party_cmsis.git
 	branch = .
 [submodule "third_party/bounds_checking_function"]
 	path = third_party/bounds_checking_function
-	url = ../third_party_bounds_checking_function.git
+	url = https://gitee.com/openharmony/third_party_bounds_checking_function.git
+	branch = .
+[submodule "third_party/FatFs"]
+	path = third_party/FatFs
+	url = https://gitee.com/openharmony/third_party_FatFs.git
 	branch = .

BUILD.gn

@@ -38,9 +38,9 @@ declare_args() {
 
 group("kernel") {
   deps = [
-    "components/bounds_checking_function:sec",
     "kernel:kernel",
     "utils:utils",
+    "//third_party/bounds_checking_function:libsec_static",
   ]
   if (enable_ohos_kernel_liteos_m_cppsupport == true) {
     deps += [ "components/cppsupport:cppsupport" ]

components/backtrace/BUILD.gn

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

components/cppsupport/BUILD.gn

@@ -30,8 +30,5 @@
 static_library("cppsupport") {
   sources = [ "los_cppsupport.c" ]
 
-  include_dirs = [
-    "../../utils",
-    "./",
-  ]
+  include_dirs = [ "../../utils" ]
 }

components/cpup/BUILD.gn

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

components/exchook/BUILD.gn

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

components/fs/fatfs/BUILD.gn

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

components/fs/fatfs/fatfs.c

@@ -41,7 +41,7 @@
 #include "securec.h"
 #include "los_compiler.h"
 #include "los_debug.h"
-#include "cmsis_os.h"
+#include "cmsis_os2.h"
 
 #define FS_SUCCESS            0
 #define FS_FAILURE            (-1)

kal/BUILD.gn

@@ -35,7 +35,6 @@ declare_args() {
 }
 
 lite_component("kal") {
-
   features = []
 
   if (enable_ohos_kernel_liteos_m_cmsis == true) {

kal/posix/BUILD.gn

@@ -34,10 +34,10 @@ static_library("posix") {
     "src/malloc.c",
     "src/pthread.c",
     "src/pthread_attr.c",
+    "src/pthread_cond.c",
     "src/pthread_mutex.c",
     "src/semaphore.c",
     "src/time.c",
-    "src/pthread_cond.c",
   ]
 
   include_dirs = [
@@ -45,6 +45,6 @@ static_library("posix") {
     "../../kernel/arch/include",
     "../../kernel/include",
     "../../utils",
-    "//third_party/bounds_checking_function/include",
+    "../../third_party/bounds_checking_function/include",
   ]
 }

kernel/BUILD.gn

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

kernel/arch/arm/cortex-m33/gcc/BUILD.gn

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

kernel/arch/arm/cortex-m4/gcc/BUILD.gn

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

kernel/arch/arm/cortex-m7/gcc/BUILD.gn

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

kernel/arch/risc-v/riscv32/gcc/BUILD.gn

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

FatFs @ fb2d8394

+Subproject commit fb2d8394023a6eef12c5bd3eda8978f5e294e070

utils/BUILD.gn

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