!1158 Fix : 部件化需求整改

Merge pull request !1158 from yinjiaming/bundle

apps/lms/BUILD.gn

@@ -73,5 +73,5 @@ executable("sample_usr_lms") {
     "-Wl,--wrap=strcpy",
     "-Wl,--wrap=strcat",
   ]
-  deps = [ "//kernel/liteos_a/kernel/extended/lms/usr:usrlmslib" ]
+  deps = [ "$LITEOSTOPDIR/kernel/extended/lms/usr:usrlmslib" ]
 }

bundle.json

@@ -28,15 +28,15 @@
         "name": "liteos_a",
         "subsystem": "kernel",
         "syscap": [
-            "SystemCapability.Kernel.liteos-a"
+            "SystemCapability.Kernel.Liteos-A"
         ],
         "features": [],
-        "adated_system_type": [
+        "adapted_system_type": [
             "small"
         ],
         "rom": "1.5MB",
         "ram": "2MB",
-        "deps": {
+        "external_deps": {
             "components": [
             ], 
             "third_party": [

fs/vfs/BUILD.gn

@@ -34,11 +34,8 @@ module_switch = defined(LOSCFG_FS_VFS)
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
   sources = [
-    "$LITEOSTOPDIR/fs/vfs/epoll/fs_epoll.c",
-    "$LITEOSTOPDIR/fs/vfs/mount.c",
-    "$LITEOSTOPDIR/fs/vfs/path_cache.c",
-    "$LITEOSTOPDIR/fs/vfs/vnode.c",
-    "$LITEOSTOPDIR/fs/vfs/vnode_hash.c",
+    "epoll/fs_epoll.c",
+    "mount.c",
     "operation/fullpath.c",
     "operation/vfs_chattr.c",
     "operation/vfs_check.c",
@@ -55,7 +52,10 @@ kernel_module(module_name) {
     "operation/vfs_readv.c",
     "operation/vfs_utime.c",
     "operation/vfs_writev.c",
+    "path_cache.c",
     "vfs_cmd/vfs_shellcmd.c",
+    "vnode.c",
+    "vnode_hash.c",
   ]
   sources += NUTTX_FS_DIRENT_SRC_FILES
   sources += NUTTX_FS_DRIVER_SRC_FILES

testsuites/kernel/BUILD.gn

@@ -39,21 +39,21 @@ declare_args() {
 config("liteos_kernel_test_public") {
   cflags = [ "-Wno-error" ]
   include_dirs = [
-    "//kernel/liteos_a/kernel/include",
-    "//kernel/liteos_a/kernel/base/include",
-    "//kernel/liteos_a/kernel/common",
-    "//kernel/liteos_a/arch/arm/arm/include",
-    "//kernel/liteos_a/arch/arm/include",
-    "//kernel/liteos_a/extended/include",
+    "$LITEOSTOPDIR/kernel/include",
+    "$LITEOSTOPDIR/kernel/base/include",
+    "$LITEOSTOPDIR/kernel/common",
+    "$LITEOSTOPDIR/arch/arm/arm/include",
+    "$LITEOSTOPDIR/arch/arm/include",
+    "$LITEOSTOPDIR/extended/include",
     "//third_party/musl/porting/liteos_a/kernel/include",
     "//third_party/bounds_checking_function/include/",
-    "//kernel/liteos_a/lib/libscrew/include",
-    "//kernel/liteos_a/fs/vfs",
-    "//kernel/liteos_a/fs/proc/include",
-    "//kernel/liteos_a/fs/jffs2/include",
-    "//kernel/liteos_a/fs/nfs/include",
-    "//kernel/liteos_a/bsd/compat/linuxkpi/include",
-    "//kernel/liteos_a/testsuites/kernel/include",
+    "$LITEOSTOPDIR/lib/libscrew/include",
+    "$LITEOSTOPDIR/fs/vfs",
+    "$LITEOSTOPDIR/fs/proc/include",
+    "$LITEOSTOPDIR/fs/jffs2/include",
+    "$LITEOSTOPDIR/fs/nfs/include",
+    "$LITEOSTOPDIR/bsd/compat/linuxkpi/include",
+    "include",
   ]
 
   if (LOSCFG_TEST_KERNEL_BASE) {

testsuites/kernel/sample/kernel_base/core/BUILD.gn

@@ -260,5 +260,5 @@ kernel_module("test_core") {
   ]
 
   public_configs =
-      [ "//kernel/liteos_a/testsuites/kernel:liteos_kernel_test_public" ]
+      [ "$LITEOSTOPDIR/testsuites/kernel:liteos_kernel_test_public" ]
 }

testsuites/kernel/sample/kernel_base/ipc/BUILD.gn

@@ -107,5 +107,5 @@ kernel_module("test_ipc") {
   ]
 
   public_configs =
-      [ "//kernel/liteos_a/testsuites/kernel:liteos_kernel_test_public" ]
+      [ "$LITEOSTOPDIR/testsuites/kernel:liteos_kernel_test_public" ]
 }