From c0cf051adf0098814cf7c30f383bde5b55a2afe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Mon, 2 Dec 2024 09:32:19 +0800 Subject: [PATCH 1/4] UI build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- bundle.json | 4 +++- display/entry/BUILD.gn | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index dd2be1b8d..70b20e101 100644 --- a/bundle.json +++ b/bundle.json @@ -64,7 +64,9 @@ }, "build": { "group_type": { - "base_group": [], + "base_group": [ + "//foundation/distributedhardware/device_manager/display/entry:DeviceManager_UI" + ], "fwk_group": [ "//foundation/distributedhardware/device_manager:device_manager_fwk" ], diff --git a/display/entry/BUILD.gn b/display/entry/BUILD.gn index 60875929a..2f7575225 100644 --- a/display/entry/BUILD.gn +++ b/display/entry/BUILD.gn @@ -22,8 +22,8 @@ ohos_hap("DeviceManager_UI") { publicity_file = "../publicity.xml" certificate_profile = "../signature/DeviceManager_UI.p7b" hap_name = "DeviceManager_UI" - part_name = "prebuilt_hap" - subsystem_name = "applications" + part_name = "device_manager" + subsystem_name = "distributedhardware" js_build_mode = "release" module_install_dir = "app/com.ohos.devicemanagerui" if (defined(sign_hap_py_path)) { -- Gitee From e9a223fc810822ccd262752f4c2da18c98bbb92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Mon, 2 Dec 2024 17:23:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- BUILD.gn | 9 +++++++++ bundle.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index f35ac3830..8178b97f1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -14,6 +14,9 @@ if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") if (ohos_kernel_type == "liteos_m") { + lite_component("device_manager_hap") { + features = [] + } lite_component("device_manager") { features = [ "interfaces/inner_kits/native_cpp:devicemanagersdk" ] } @@ -25,6 +28,9 @@ if (defined(ohos_lite)) { deps = [] } } else { + lite_component("device_manager_hap") { + features = [] + } lite_component("device_manager") { features = [ "utils:devicemanagerutils", @@ -47,6 +53,9 @@ if (defined(ohos_lite)) { if (defined(harmony_industry_project) && harmony_industry_project == "MINE_HARMONY") { } + group("device_manager_hap") { + deps = [ "display/entry:DeviceManager_UI" ] + } group("device_manager") { deps = [ "ext:ext_modules", diff --git a/bundle.json b/bundle.json index 70b20e101..982c6eba9 100644 --- a/bundle.json +++ b/bundle.json @@ -65,7 +65,7 @@ "build": { "group_type": { "base_group": [ - "//foundation/distributedhardware/device_manager/display/entry:DeviceManager_UI" + "//foundation/distributedhardware/device_manager:device_manager_hap" ], "fwk_group": [ "//foundation/distributedhardware/device_manager:device_manager_fwk" -- Gitee From 0558209ae08b363841aad6271b703d07753f0c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Mon, 2 Dec 2024 19:43:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- bundle.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bundle.json b/bundle.json index 982c6eba9..7dc5a6510 100644 --- a/bundle.json +++ b/bundle.json @@ -64,11 +64,10 @@ }, "build": { "group_type": { - "base_group": [ - "//foundation/distributedhardware/device_manager:device_manager_hap" - ], + "base_group": [], "fwk_group": [ - "//foundation/distributedhardware/device_manager:device_manager_fwk" + "//foundation/distributedhardware/device_manager:device_manager_fwk", + "//foundation/distributedhardware/device_manager:device_manager_hap" ], "service_group": [ "//foundation/distributedhardware/device_manager:device_manager", -- Gitee From 5c6789c20abca14ab8105246a4c42c8b4b3847ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Mon, 2 Dec 2024 19:46:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- bundle.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index 7dc5a6510..b7071974e 100644 --- a/bundle.json +++ b/bundle.json @@ -66,13 +66,13 @@ "group_type": { "base_group": [], "fwk_group": [ - "//foundation/distributedhardware/device_manager:device_manager_fwk", - "//foundation/distributedhardware/device_manager:device_manager_hap" + "//foundation/distributedhardware/device_manager:device_manager_fwk" ], "service_group": [ "//foundation/distributedhardware/device_manager:device_manager", "//foundation/distributedhardware/device_manager/sa_profile:device_manager.cfg", - "//foundation/distributedhardware/device_manager/sa_profile:dm_sa_profile" + "//foundation/distributedhardware/device_manager/sa_profile:dm_sa_profile", + "//foundation/distributedhardware/device_manager:device_manager_hap" ] }, "inner_kits": [{ -- Gitee