!1060 Fix : 部件化需求整改

Merge pull request !1060 from yinjiaming/bundle

bundle.json

@@ -28,7 +28,7 @@
         "name": "liteos_m",
         "subsystem": "kernel",
         "syscap": [
-            "SystemCapability.Kernel.liteos-m"
+            "SystemCapability.Kernel.Liteos-M"
         ],
         "features": [],
         "adapted_system_type": [
@@ -36,7 +36,7 @@
         ],
         "rom": "300KB",
         "ram": "100KB",
-        "deps": {
+        "external_deps": {
             "components": [
                 "utils_lite"
             ],

components/fs/vfs/BUILD.gn

@@ -41,14 +41,14 @@ kernel_module(module_name) {
   ]
 
   include_dirs = [
-    "//kernel/liteos_m/kernel/arch/include",
+    "$LITEOSTOPDIR/kernel/arch/include",
-    "//kernel/liteos_m/kernel/include",
+    "$LITEOSTOPDIR/kernel/include",
-    "//kernel/liteos_m/utils",
+    "$LITEOSTOPDIR/utils",
     "../",
     ".",
   ]
 
-  deps = [ "//kernel/liteos_m/kal" ]
+  deps = [ "$LITEOSTOPDIR/kal" ]
   configs += [ "$LITEOSTOPDIR:warn_config" ]
   if (!defined(LOSCFG_COMPILER_ICCARM)) {
     cflags = [ "-Wno-parentheses" ]

testsuites/sample/cmsis/BUILD.gn

@@ -26,8 +26,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_cmsis") {
   sources = [ "cmsis_func_test.c" ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/atomic/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_atomic") {
   sources = [
     "it_los_atomic.c",
@@ -43,5 +45,5 @@ static_library("test_atomic") {
     "it_los_atomic_011.c",
   ]
   include_dirs = [ "." ]
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/event/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_event") {
   sources = [
     "It_los_event.c",
@@ -74,5 +76,5 @@ static_library("test_event") {
     "It_los_event_043.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/hwi/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_hwi") {
   sources = [
     "It_los_hwi.c",
@@ -72,5 +74,5 @@ static_library("test_hwi") {
     "llt_los_hwi_035.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/lmk/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_lmk") {
   sources = [
     "It_los_lmk.c",
@@ -35,7 +37,7 @@ static_library("test_lmk") {
     "It_los_lmk_004.c",
   ]
 
-  include_dirs = [ "//kernel/liteos_m/components/lmk" ]
+  include_dirs = [ "$LITEOSTOPDIR/components/lmk" ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/lms/BUILD.gn

@@ -25,7 +25,9 @@
 # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import("//kernel/liteos_m/liteos.gni")
 
 static_library("test_lms") {
   sources = [
@@ -74,5 +76,5 @@ static_library("test_lms") {
     ]
   }
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/mem/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_mem") {
   sources = [
     "It_los_mem_001.c",
@@ -61,5 +63,5 @@ static_library("test_mem") {
     "it_los_mem.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/mux/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_mux") {
   sources = [
     "It_los_mutex_001.c",
@@ -64,5 +66,5 @@ static_library("test_mux") {
     "It_los_mux.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/power/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_pm") {
   sources = [
     "It_los_pm.c",
@@ -34,7 +36,7 @@ static_library("test_pm") {
     "It_los_pm_003.c",
   ]
 
-  include_dirs = [ "//kernel/liteos_m/components/power" ]
+  include_dirs = [ "$LITEOSTOPDIR/components/power" ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/queue/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_queue") {
   sources = [
     "It_los_queue.c",
@@ -172,5 +174,5 @@ static_library("test_queue") {
     "Llt_los_queue_001.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/sem/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_sem") {
   sources = [
     "It_los_sem.c",
@@ -75,5 +77,5 @@ static_library("test_sem") {
     "it_los_sem_043.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/signal/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_signal") {
   sources = [
     "It_los_signal.c",
@@ -36,5 +38,5 @@ static_library("test_signal") {
     "It_los_signal_005.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/swtmr/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_swtmr") {
   sources = [
     "It_los_swtmr.c",
@@ -146,5 +148,5 @@ static_library("test_swtmr") {
     "It_los_swtmr_Delay_005.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/task/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_task") {
   sources = [
     "It_los_task.c",
@@ -159,5 +161,5 @@ static_library("test_task") {
     "It_los_task_130.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/posix/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_posix") {
   sources = [
     "mqueue/It_posix_queue.c",
@@ -160,5 +162,5 @@ static_library("test_posix") {
     "pthread_func_test.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/unittest/posix/BUILD.gn

@@ -78,5 +78,5 @@ static_library("posix_test") {
     cflags = [ "--no_warnings" ]
   }
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }