From e13b81965e6377848484c18e751060c47ec8d8eb Mon Sep 17 00:00:00 2001 From: "hanlu1@huawei.com" Date: Tue, 16 Jul 2024 10:38:00 +0800 Subject: [PATCH] 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",