From e679bc0515b8a5eeb2a8c69238a5f006b15efd5f Mon Sep 17 00:00:00 2001 From: "hanlu1@huawei.com" Date: Mon, 15 Jul 2024 21:47:20 +0800 Subject: [PATCH 1/6] feature Signed-off-by: hanlu1@huawei.com --- bundle.json | 5 +++++ bundle_framework_lite.gni | 6 +++--- frameworks/bundle_lite/BUILD.gn | 2 +- services/bundlemgr_lite/BUILD.gn | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bundle.json b/bundle.json index e681b11..cee8fa4 100644 --- a/bundle.json +++ b/bundle.json @@ -14,6 +14,11 @@ "component": { "name": "bundle_framework_lite", "subsystem": "bundlemanager", + "features": [ + "bundle_framework_lite_enable_ohos_bundle_manager_service_permission", + "bundle_framework_lite_enable_ohos_bundle_manager_service", + "bundle_framework_lite_enable_ohos_bundle_manager_service_parse_metadata" + ], "adapted_system_type": [ "mini", "small" diff --git a/bundle_framework_lite.gni b/bundle_framework_lite.gni index 7cc51aa..7ab616d 100644 --- a/bundle_framework_lite.gni +++ b/bundle_framework_lite.gni @@ -24,7 +24,7 @@ startup_path = "//base/startup" utils_lite_path = "//commonlibrary/utils_lite" declare_args() { - enable_ohos_bundle_manager_service = false - enable_ohos_bundle_manager_service_permission = false - enable_ohos_bundle_manager_service_parse_metadata = false + bundle_framework_lite_enable_ohos_bundle_manager_service = false + bundle_framework_lite_enable_ohos_bundle_manager_service_permission = false + bundle_framework_lite_enable_ohos_bundle_manager_service_parse_metadata = false } diff --git a/frameworks/bundle_lite/BUILD.gn b/frameworks/bundle_lite/BUILD.gn index 9f4c463..b4ff86a 100644 --- a/frameworks/bundle_lite/BUILD.gn +++ b/frameworks/bundle_lite/BUILD.gn @@ -31,7 +31,7 @@ lite_library("bundle") { if (ohos_kernel_type == "liteos_m") { target_type = "static_library" - if (enable_ohos_bundle_manager_service_parse_metadata == true) { + if (bundle_framework_lite_enable_ohos_bundle_manager_service_parse_metadata == true) { defines = [ "_MINI_BMS_PARSE_METADATA_" ] } diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index d40543b..484016a 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -34,11 +34,11 @@ if (ohos_kernel_type == "liteos_m") { ] defines = [ "JERRY_FOR_IAR_CONFIG" ] - if (enable_ohos_bundle_manager_service == true) { + if (bundle_framework_lite_enable_ohos_bundle_manager_service == true) { defines += [ "_MINI_BMS_" ] } - if (enable_ohos_bundle_manager_service_permission == true) { + if (bundle_framework_lite_bundle_framework_lite_enable_ohos_bundle_manager_service_permission == true) { defines += [ "_MINI_BMS_PERMISSION_", "BC_TRANS_ENABLE", -- Gitee From 41e6f09a815e0c66e7fbc6f1d42fc7a2d648551b Mon Sep 17 00:00:00 2001 From: "hanlu1@huawei.com" Date: Tue, 16 Jul 2024 10:35:48 +0800 Subject: [PATCH 2/6] feature Signed-off-by: hanlu1@huawei.com --- bundle.json | 5 +++++ bundle_framework_lite.gni | 6 +++--- frameworks/bundle_lite/BUILD.gn | 2 +- services/bundlemgr_lite/BUILD.gn | 8 ++++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/bundle.json b/bundle.json index e681b11..cee8fa4 100644 --- a/bundle.json +++ b/bundle.json @@ -14,6 +14,11 @@ "component": { "name": "bundle_framework_lite", "subsystem": "bundlemanager", + "features": [ + "bundle_framework_lite_enable_ohos_bundle_manager_service_permission", + "bundle_framework_lite_enable_ohos_bundle_manager_service", + "bundle_framework_lite_enable_ohos_bundle_manager_service_parse_metadata" + ], "adapted_system_type": [ "mini", "small" diff --git a/bundle_framework_lite.gni b/bundle_framework_lite.gni index 7cc51aa..7ab616d 100644 --- a/bundle_framework_lite.gni +++ b/bundle_framework_lite.gni @@ -24,7 +24,7 @@ startup_path = "//base/startup" utils_lite_path = "//commonlibrary/utils_lite" declare_args() { - enable_ohos_bundle_manager_service = false - enable_ohos_bundle_manager_service_permission = false - enable_ohos_bundle_manager_service_parse_metadata = false + bundle_framework_lite_enable_ohos_bundle_manager_service = false + bundle_framework_lite_enable_ohos_bundle_manager_service_permission = false + bundle_framework_lite_enable_ohos_bundle_manager_service_parse_metadata = false } diff --git a/frameworks/bundle_lite/BUILD.gn b/frameworks/bundle_lite/BUILD.gn index 9f4c463..b4ff86a 100644 --- a/frameworks/bundle_lite/BUILD.gn +++ b/frameworks/bundle_lite/BUILD.gn @@ -31,7 +31,7 @@ lite_library("bundle") { if (ohos_kernel_type == "liteos_m") { target_type = "static_library" - if (enable_ohos_bundle_manager_service_parse_metadata == true) { + if (bundle_framework_lite_enable_ohos_bundle_manager_service_parse_metadata == true) { defines = [ "_MINI_BMS_PARSE_METADATA_" ] } diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index d40543b..3503cac 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -34,11 +34,15 @@ if (ohos_kernel_type == "liteos_m") { ] defines = [ "JERRY_FOR_IAR_CONFIG" ] - if (enable_ohos_bundle_manager_service == true) { + if (bundle_framework_lite_enable_ohos_bundle_manager_service == true) { defines += [ "_MINI_BMS_" ] } - if (enable_ohos_bundle_manager_service_permission == true) { +<<<<<<< HEAD + if (bundle_framework_lite_enable_ohos_bundle_manager_service_permission == true) { +======= + if (bundle_framework_lite_bundle_framework_lite_enable_ohos_bundle_manager_service_permission == true) { +>>>>>>> e679bc0515b8a5eeb2a8c69238a5f006b15efd5f defines += [ "_MINI_BMS_PERMISSION_", "BC_TRANS_ENABLE", -- Gitee From 4fd04a9d61cf34fb623a6f1d3a0b651c786bdb4e Mon Sep 17 00:00:00 2001 From: "hanlu1@huawei.com" Date: Tue, 16 Jul 2024 10:38:00 +0800 Subject: [PATCH 3/6] fix Signed-off-by: hanlu1@huawei.com --- services/bundlemgr_lite/BUILD.gn | 8 -------- 1 file changed, 8 deletions(-) diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index 2960dd3..10b113d 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -38,15 +38,7 @@ if (ohos_kernel_type == "liteos_m") { defines += [ "_MINI_BMS_" ] } -<<<<<<< HEAD -<<<<<<< HEAD if (bundle_framework_lite_enable_ohos_bundle_manager_service_permission == true) { -======= - if (bundle_framework_lite_bundle_framework_lite_enable_ohos_bundle_manager_service_permission == true) { ->>>>>>> e679bc0515b8a5eeb2a8c69238a5f006b15efd5f -======= - if (bundle_framework_lite_bundle_framework_lite_enable_ohos_bundle_manager_service_permission == true) { ->>>>>>> e679bc0515b8a5eeb2a8c69238a5f006b15efd5f defines += [ "_MINI_BMS_PERMISSION_", "BC_TRANS_ENABLE", -- Gitee From bc7ce4c9ef22016e8e151098e93a91718dcded96 Mon Sep 17 00:00:00 2001 From: "hanlu1@huawei.com" Date: Tue, 16 Jul 2024 10:54:55 +0800 Subject: [PATCH 4/6] fix Signed-off-by: hanlu1@huawei.com --- bundle_framework_lite.gni | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundle_framework_lite.gni b/bundle_framework_lite.gni index 7ab616d..7e37234 100644 --- a/bundle_framework_lite.gni +++ b/bundle_framework_lite.gni @@ -26,5 +26,6 @@ utils_lite_path = "//commonlibrary/utils_lite" declare_args() { bundle_framework_lite_enable_ohos_bundle_manager_service = false bundle_framework_lite_enable_ohos_bundle_manager_service_permission = false - bundle_framework_lite_enable_ohos_bundle_manager_service_parse_metadata = false + bundle_framework_lite_enable_ohos_bundle_manager_service_parse_metadata = + false } -- Gitee From 512b97a49a0731eeb4005f6d752fbf711db276a5 Mon Sep 17 00:00:00 2001 From: "hanlu1@huawei.com" Date: Tue, 16 Jul 2024 11:46:56 +0800 Subject: [PATCH 5/6] f Signed-off-by: hanlu1@huawei.com --- services/bundlemgr_lite/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index 10b113d..11a6ddb 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -45,7 +45,7 @@ if (ohos_kernel_type == "liteos_m") { ] } - if (enable_ohos_bundle_manager_service_parse_metadata == true) { + if (bundle_framework_lite_enable_ohos_bundle_manager_service_parse_metadata == true) { defines += [ "_MINI_BMS_PARSE_METADATA_" ] } -- Gitee From 7615f3ff689249a0628b5c1f8421cc5cc6164687 Mon Sep 17 00:00:00 2001 From: "hanlu1@huawei.com" Date: Tue, 16 Jul 2024 14:08:16 +0800 Subject: [PATCH 6/6] fix Signed-off-by: hanlu1@huawei.com --- services/bundlemgr_lite/BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn index 11a6ddb..6879ad3 100644 --- a/services/bundlemgr_lite/BUILD.gn +++ b/services/bundlemgr_lite/BUILD.gn @@ -38,7 +38,8 @@ if (ohos_kernel_type == "liteos_m") { defines += [ "_MINI_BMS_" ] } - if (bundle_framework_lite_enable_ohos_bundle_manager_service_permission == true) { + if (bundle_framework_lite_enable_ohos_bundle_manager_service_permission == + true) { defines += [ "_MINI_BMS_PERMISSION_", "BC_TRANS_ENABLE", -- Gitee