!568 liteos-m kernel 部件标准化

Merge pull request !568 from Hongjin Li/lihongjin/br_dev

bundle.json

@@ -0,0 +1,63 @@
+{
+    "name": "@ohos/liteos_m",
+    "version": "3.1.0",
+    "description": "liteos-m kernel",
+    "publishAs": "code-segment",
+    "homePage": "https://gitee.com/openharmony",
+    "repository": "https://gitee.com/openharmony/kernel_liteos_m",
+    "license": "BSD 3-clause",
+    "domain": "os",
+    "language": "",
+    "private": false,
+    "scripts": {},
+    "tags": [
+        "kernel"
+    ],
+    "keywords": [
+        "kernel",
+        "liteos-m"
+    ],
+    "envs": [],
+    "dirs": [],
+    "author": {},
+    "contributors": [],
+    "segment": {
+        "destPath": "kernel/liteos_m"
+    },
+    "component": {
+        "name": "liteos_m",
+        "subsystem": "kernel",
+        "syscap": [
+            "SystemCapability.Kernel.liteos-m"
+        ],
+        "features": [],
+        "adapted_system_type": [
+            "mini"
+        ],
+        "rom": "300KB",
+        "ram": "100KB",
+        "deps": {
+            "components": [
+                "utils_lite"
+            ],
+            "third_party": [
+                "bounds_checking_function",
+                "cmsis",
+                "fatfs",
+                "littlefs",
+                "lwip",
+                "musl"
+            ]
+        },
+        "build": {
+            "sub_component": [
+                "//kernel/liteos_m:kernel",
+                "//kernel/liteos_m:build_kernel_image"
+            ],
+            "inner_kits": [],
+            "test": [
+                "//kernel/liteos_m/testsuites:testsuites"
+            ]
+        }
+    }
+}

components/fs/fatfs/BUILD.gn

@@ -28,21 +28,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
+import("//third_party/FatFs/FatFs.gni")
 
 module_switch = defined(LOSCFG_FS_FAT)
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
-  sources = [
-    "$LITEOSTHIRDPARTY/FatFs/source/diskio.c",
-    "$LITEOSTHIRDPARTY/FatFs/source/ff.c",
-    "$LITEOSTHIRDPARTY/FatFs/source/ffsystem.c",
-    "$LITEOSTHIRDPARTY/FatFs/source/ffunicode.c",
-    "fatfs.c",
-  ]
   configs += [ "$LITEOSTOPDIR:warn_config" ]
+  sources = FATFS_SRC_FILES + [ "fatfs.c" ]
 }
 
 config("public") {
-  include_dirs = [ "." ]
-  include_dirs += [ "$LITEOSTHIRDPARTY/FatFs/source" ]
+  include_dirs = FATFS_INCLUDE_DIRS + [ "." ]
 }

components/fs/littlefs/BUILD.gn

@@ -28,21 +28,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
+import("//third_party/littlefs/littlefs.gni")
 
 module_switch = defined(LOSCFG_FS_LITTLEFS)
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
-  sources = [
-    "$LITEOSTHIRDPARTY/littlefs/bd/lfs_rambd.c",
-    "$LITEOSTHIRDPARTY/littlefs/lfs.c",
-    "$LITEOSTHIRDPARTY/littlefs/lfs_util.c",
-    "lfs_api.c",
-  ]
   configs += [ "$LITEOSTOPDIR:warn_config" ]
+  sources = LITTLEFS_SRC_FILES_FOR_KERNEL_MODULE + [ "lfs_api.c" ]
 }
 
 config("public") {
-  include_dirs = [ "." ]
-  include_dirs += [ "$LITEOSTHIRDPARTY/littlefs" ]
-  include_dirs += [ "$LITEOSTHIRDPARTY/littlefs/bd" ]
+  include_dirs = LITTLEFS_INCLUDE_DIRS + [ "." ]
 }

kal/cmsis/BUILD.gn

@@ -28,6 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
+import("//third_party/cmsis/cmsis.gni")
 
 module_switch = defined(LOSCFG_KAL_CMSIS)
 module_name = get_path_info(rebase_path("."), "name")
@@ -37,9 +38,5 @@ kernel_module(module_name) {
 }
 
 config("public") {
-  include_dirs = [
-    ".",
-    "$LITEOSTHIRDPARTY/cmsis/CMSIS/RTOS2/Include",
-    "$LITEOSTHIRDPARTY/cmsis/CMSIS/Core/Include",
-  ]
+  include_dirs = CMSIS_INCLUDE_DIRS + [ "." ]
 }

kal/libc/musl/BUILD.gn

@@ -28,6 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
+import("//third_party/musl/porting/liteos_m/kernel/musl.gni")
 
 module_switch = defined(LOSCFG_LIBC_MUSL)
 module_name = get_path_info(rebase_path("."), "name")
@@ -43,5 +44,5 @@ kernel_module(module_name) {
 }
 
 config("public") {
-  include_dirs = [ "//third_party/musl/porting/liteos_m/kernel/include" ]
+  include_dirs = MUSL_INCLUDE_DIRS
 }

testsuites/BUILD.gn

@@ -31,12 +31,7 @@ import("//kernel/liteos_m/liteos.gni")
 
 config("include") {
   defines = []
-  include_dirs = [
-    "include",
-    "//kernel/liteos_m/kernel/include",
-    "//kernel/liteos_m/kernel/arch/include",
-    "//kernel/liteos_m/components/cpup",
-  ]
+  include_dirs = [ "include" ]
 
   if (defined(LOSCFG_KERNEL_TEST_FULL)) {
     defines += [ "LOS_KERNEL_TEST_FULL=1" ]