diff --git a/components/aafwk.json b/components/aafwk.json index 7641008b7c7bd7db3e3df2d7229768025c8e6362..93f4378ced6b1a2435742d5ecc6a00b4942848da 100755 --- a/components/aafwk.json +++ b/components/aafwk.json @@ -42,8 +42,8 @@ "components": [ "hilog_lite", "permission", - "ipc_lite", - "samgr_lite", + "ipc", + "system_ability_manager", "appspawn", "wms" ] diff --git a/components/ace.json b/components/ace.json index a57287f55d04d51f26e2da2e8dfe53203cb9f67d..f05f4d555d99df4047c1732c3565cada6b52bc19 100755 --- a/components/ace.json +++ b/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" ] } diff --git a/components/ai.json b/components/ai.json index ea028aa0fbb5df203c3001a7f717a0fc766d2c85..60c19eac7c35df3d1b310667b723ceeb0741ef93 100755 --- a/components/ai.json +++ b/components/ai.json @@ -28,8 +28,8 @@ "components": [ "hilog_lite", "utils_base", - "ipc_lite", - "samgr_lite" + "ipc", + "system_ability_manager" ] } } diff --git a/components/appexecfwk.json b/components/appexecfwk.json index ff83cbc8792958095e21b27cbc7e2806c21bf760..46636ee37e2acf57fb9080a14fab05b78c648c33 100755 --- a/components/appexecfwk.json +++ b/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" ] diff --git a/components/applications.json b/components/applications.json index 54a386d88738dcc1b4b1037f17f52ed70121b69b..2e7c78dab56c561e2c958ba652c217ac304e945d 100755 --- a/components/applications.json +++ b/components/applications.json @@ -68,7 +68,6 @@ ] }, "components": [ - "liteos_a", "media_lite", "syspara", "hilog", diff --git a/components/communication.json b/components/communication.json index 1a8d0b918523d1ac33259bc81994b5341bd046dc..823203112d361fd4d6a3ec9478442c958d8c23b4 100755 --- a/components/communication.json +++ b/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": [] } diff --git a/components/distributed_schedule.json b/components/distributed_schedule.json index 759d26428129b665aee897e85722e5260c30dfe2..8f357703fd8a27137ee78075263c499a305d9ec4 100755 --- a/components/distributed_schedule.json +++ b/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" ] diff --git a/components/drivers.json b/components/drivers.json old mode 100644 new mode 100755 index 565d63119a004d00816001b6c9332e0b2d7356c0..75ecac0de282e98db2d972521940dab561a7511e --- a/components/drivers.json +++ b/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": [ diff --git a/components/graphic.json b/components/graphic.json index 3f6a5296e237b4d9128e3a4b77fead4a51be8151..cd52c99f787fc3cb9362c48eba788344375dae62 100755 --- a/components/graphic.json +++ b/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": { diff --git a/components/hiviewdfx.json b/components/hiviewdfx.json index ce223bfe6624fd10748dd76db388028a65b0b3ea..218fffcc1c5d3c68b5e0a5ecd8e0159195598819 100755 --- a/components/hiviewdfx.json +++ b/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": [] } diff --git a/components/multimedia.json b/components/multimedia.json index ca4058a5c10ece9ae526ec13cb5a728f55f346ac..93545d351a474766cc342b046b07fdb3448b16b5 100755 --- a/components/multimedia.json +++ b/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" ] } diff --git a/components/pms.json b/components/pms.json index 029e46c130458b24e32fc5dc3e3d610bf15b4f22..021c22e4709f581cd58d3071b685ba99f62b7982 100755 --- a/components/pms.json +++ b/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,13 +23,13 @@ ], "deps": { "components": [ - "aafwk_lite", - "appexecfwk_lite", - "samgr_lite", - "ui" + "ability", + "bundle_mgr", + "system_ability_manager", + "ui" ], "third_party": [ - "bounds_checking_function" + "bounds_checking_function" ] } } diff --git a/components/security.json b/components/security.json index eb4bb967516fc15d4afa26347a27eb915a773748..af049a1cfccca1840fda3c6a07e62b0a009c9d85 100755 --- a/components/security.json +++ b/components/security.json @@ -129,8 +129,8 @@ "deps": { "components": [ "hilog_lite", - "samgr_lite", - "ipc_lite" + "system_ability_manager", + "ipc" ], "third_party": [ "bounds_checking_function", diff --git a/components/sensors.json b/components/sensors.json index 02f7e5d0f129604b61c2e7fa380b96f5b16158e9..6845f6fd9bc1281d12768a50be3c81748018a549 100755 --- a/components/sensors.json +++ b/components/sensors.json @@ -22,8 +22,8 @@ "features": [], "deps": { "components": [ - "samgr_lite", - "ipc_lite" + "system_ability_manager", + "ipc" ], "third_party": [ diff --git a/components/startup.json b/components/startup.json index 8f22c46cd152604ea185ecb1e5c44a61bec202b6..94860d39e07555ba40f3d2f5c3263411b18b6941 100755 --- a/components/startup.json +++ b/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" diff --git a/components/vendor.json b/components/vendor.json old mode 100644 new mode 100755 index 792e0ac73df2d199b7098ecadc00c6e13306d782..78803410c9268ee177093d9b7e67a11477c972b4 --- a/components/vendor.json +++ b/components/vendor.json @@ -186,38 +186,6 @@ "adapted_kernel": [ "liteos_a" ], "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", @@ -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" ] }