!28 Correct components dependencies.

Merge pull request !28 from jady3356/hpm

components/aafwk.json

@@ -42,8 +42,8 @@
         "components": [
           "hilog_lite",
           "permission",
-          "ipc_lite",
-          "samgr_lite",
+          "ipc",
+          "system_ability_manager",
           "appspawn",
           "wms"
         ]

components/ace.json

@@ -38,12 +38,11 @@
           "surface",
           "i18n",
           "global_resource_manager",
-          "samgr_lite",
+          "system_ability_manager",
           "hilog_lite",
           "permission",
-          "ipc_lite",
+          "ipc",
           "kal_timer",
-          "liteos_a",
           "kv_store"
         ]
       }

components/ai.json

@@ -28,8 +28,8 @@
         "components": [
           "hilog_lite",
           "utils_base",
-          "ipc_lite",
-          "samgr_lite"
+          "ipc",
+          "system_ability_manager"
         ]
       }
     }

components/appexecfwk.json

@@ -34,11 +34,11 @@
         "board_special": {},
         "components": [
           "hilog_lite",
-          "aafwk_lite",
+          "ability",
           "permission",
-          "ipc_lite",
-          "samgr_lite",
-          "resmgr_lite",
+          "ipc",
+          "system_ability_manager",
+          "global_resource_manager",
           "ability",
           "app_verify"
         ]

components/applications.json

@@ -68,7 +68,6 @@
           ]
         },
         "components": [
-          "liteos_a",
           "media_lite",
           "syspara",
           "hilog",

components/communication.json

@@ -63,8 +63,6 @@
           ],
           "liteos_m": [
             "wlan",
-            "liteos_m",
-            "hi3861_sdk",
             "utils_base"
           ]
         },
@@ -140,9 +138,6 @@
         "kernel_special": {},
         "board_special": {},
         "components": [
-          "liteos_m",
-          "hi3861_adapter",
-          "hi3861_sdk",
           "utils_base"
         ]
       }
@@ -164,8 +159,6 @@
       "features": [],
       "deps": {
         "components": [
-          "hi3861_adapter",
-          "hi3861_sdk"
         ],
         "third_party": []
       }

components/distributed_schedule.json

@@ -62,7 +62,7 @@
         },
         "components": [
           "utils_base",
-          "ipc_lite",
+          "ipc",
           "permission",
           "hilog_lite"
         ]
@@ -94,12 +94,12 @@
         "kernel_special": {},
         "board_special": {},
         "components": [
-          "aafwk_lite",
-          "appexecfwk_lite",
+          "ability",
+          "bundle_mgr",
           "hilog_lite",
           "permission",
           "dmsfwk_lite",
-          "samgr_lite",
+          "system_ability_manager",
           "powermgr_lite"
         ]
       }
@@ -132,9 +132,9 @@
         "board_special": {},
         "components": [
           "hilog_lite",
-          "samgr_lite",
-          "aafwk_lite",
-          "appexecfwk_lite",
+          "system_ability_manager",
+          "ability",
+          "bundle_mgr",
           "softbus_lite",
           "huks"
         ]

components/drivers.json

@@ -6,7 +6,10 @@
       "optional": "false",
       "dirs": [
         "drivers/adapter/uhdf",
-        "drivers/peripheral",
+        "drivers/peripheral/display",
+        "drivers/peripheral/input",
+        "drivers/peripheral/sensor",
+        "drivers/peripheral/wlan",
         "device/hisilicon/drivers"
       ],
       "targets": [
@@ -58,7 +61,10 @@
       "optional": "false",
       "dirs": [
         "drivers/adapter/uhdf",
-        "drivers/peripheral",
+        "drivers/peripheral/display",
+        "drivers/peripheral/input",
+        "drivers/peripheral/sensor",
+        "drivers/peripheral/wlan",
         "device/hisilicon/drivers"
       ],
       "targets": [
@@ -134,7 +140,9 @@
       "optional": "false",
       "dirs": [
         "drivers/adapter/uhdf",
-        "drivers/peripheral",
+        "drivers/peripheral/display",
+        "drivers/peripheral/input",
+        "drivers/peripheral/wlan",
         "device/hisilicon/drivers"
       ],
       "targets": [

components/graphic.json

@@ -73,7 +73,7 @@
         ],
         "components": [
           "hilog_lite",
-          "ipc_lite"
+          "ipc"
         ],
         "board_special": {
           "hi3516dv300": [
@@ -108,8 +108,8 @@
         ],
         "components": [
           "hilog_lite",
-          "ipc_lite",
-          "samgr_lite",
+          "ipc",
+          "system_ability_manager",
           "surface"
         ],
         "board_special": {

components/hiviewdfx.json

@@ -38,7 +38,7 @@
         ],
         "components": [
           "hiview_lite",
-          "samgr_lite"
+          "system_ability_manager"
         ]
       }
     },
@@ -118,7 +118,7 @@
         "components": [
           "utils_base",
           "hiview_lite",
-          "samgr_lite"
+          "system_ability_manager"
         ],
         "third_party": []
       }

components/multimedia.json

@@ -37,10 +37,10 @@
         },
         "components": [
           "hilog_lite",
-          "audio_lite",
+          "audio_manager_lite",
           "camera_lite",
           "permission",
-          "ipc_lite",
+          "ipc",
           "ui"
         ]
       }
@@ -117,10 +117,10 @@
         },
         "components": [
           "hilog_lite",
-          "audio_lite",
+          "audio_manager_lite",
           "camera_lite",
           "permission",
-          "ipc_lite",
+          "ipc",
           "ui"
         ]
       }

components/pms.json

@@ -4,7 +4,7 @@
       "component": "powermanageservice",
       "optional": "true",
       "dirs": [
-        "base/powermgr"
+        "base/powermgr/powermgr_lite"
       ],
       "targets": [
         "//base/powermgr/powermgr_lite/services:power_manage_service"
@@ -23,9 +23,9 @@
       ],
       "deps": {
         "components": [
-          "aafwk_lite",
-	  "appexecfwk_lite",
-	  "samgr_lite",
+          "ability",
+          "bundle_mgr",
+          "system_ability_manager",
           "ui"
         ],
         "third_party": [

components/security.json

@@ -129,8 +129,8 @@
       "deps": {
         "components": [
           "hilog_lite",
-          "samgr_lite",
-          "ipc_lite"
+          "system_ability_manager",
+          "ipc"
         ],
         "third_party": [
           "bounds_checking_function",

components/sensors.json

@@ -22,8 +22,8 @@
       "features": [],
       "deps": {
         "components": [
-          "samgr_lite",
-          "ipc_lite"
+          "system_ability_manager",
+          "ipc"
 
         ],
         "third_party": [

components/startup.json

@@ -31,24 +31,20 @@
         ],
         "kernel_special": {
           "liteos_a": [
-            "hilog",
-            "oem_smartvision"
+            "hilog"
           ],
           "liteos_m": [
             "hilog_lite",
             "liteos_m",
-            "hi3861_sdk",
-            "oem_iotlink"
+            "hi3861_sdk"
           ]
         },
         "board_special": {
           "hi3516dv300": [
-            "hilog",
-            "oem_smartvision"
+            "hilog"
           ],
           "hi3518ev300": [
-            "hilog",
-            "oem_smartvision"
+            "hilog"
           ],
           "hi3861v100": [
             "hilog_lite",
@@ -111,7 +107,7 @@
         },
         "components": [
           "utils_base",
-          "samgr_lite"
+          "system_ability_manager"
         ]
       }
     },
@@ -177,10 +173,10 @@
           },
           "components": [
             "hilog_lite",
-            "samgr_lite",
-            "ipc_lite",
+            "system_ability_manager",
+            "ipc",
             "kv_store",
-            "aafwk_lite",
+            "ability",
             "ace_engine_lite",
             "surface",
             "ui"

components/vendor.json

@@ -187,38 +187,6 @@
         "features": [],
         "deps": {}
     },
-    {
-      "component": "oem_smartvision",
-      "description": "",
-      "optional": "false",
-      "dirs": [
-        "vendor/huawei/camera",
-        "base/startup/syspara_lite/hals"
-      ],
-      "targets": [
-        "//vendor/huawei/camera/hals/utils/sys_param:hal_sysparam",
-        "//vendor/huawei/camera/hals/utils/token:haltoken_shared"
-      ],
-      "rom": "",
-      "ram": "",
-      "output": [],
-      "adapted_board": [
-        "hi3518ev300",
-        "hi3518ev300_openharmony",
-        "hi3516dv300",
-        "hi3516dv300_openharmony"
-      ],
-      "adapted_kernel": [ "liteos_a" ],
-      "features": [],
-      "deps": {
-        "third_party": [
-          "bounds_checking_function"
-        ],
-        "components": [
-          "utils_base"
-        ]
-      }
-    },
     {
       "component": "hi3516dv300_sdk",
       "description": "",
@@ -277,8 +245,7 @@
       "features": [],
       "deps": {
         "components": [
-          "utils_base",
-          "liteos_m"
+          "utils_base"
         ]
       }
     },
@@ -321,11 +288,9 @@
       "dirs": [
         "device/hisilicon/hispark_pegasus/hi3861_adapter/hals/utils/file",
         "utils/native/lite/hals/file",
-        "base/iot_hardware/hals/wifiiot_lite",
         "device/hisilicon/hispark_pegasus/hi3861_adapter/hals/iot_hardware/wifiiot_lite",
         "base/update/ota_lite/hals",
         "device/hisilicon/hispark_pegasus/hi3861_adapter/hals/update",
-        "foundation/communication/hals/wifi_lite/wifiaware",
         "device/hisilicon/hispark_pegasus/hi3861_adapter/hals/communication/wifi_lite/wifiaware",
         "foundation/communication/wifi_lite/interfaces/wifiservice",
         "device/hisilicon/hispark_pegasus/hi3861_adapter/hals/communication/wifi_lite/wifiservice"
@@ -350,7 +315,6 @@
       "description": "",
       "optional": "false",
       "dirs": [
-        "vendor/huawei/wifi-iot/hals/utils",
         "base/startup/syspara_lite/hals"
       ],
       "targets": [
@@ -367,8 +331,6 @@
       "features": [],
       "deps": {
         "components": [
-          "liteos_m",
-          "hi3861_sdk",
           "utils_base"
         ]
       }