mirror of
https://github.com/openharmony/bundlemanager_bundle_framework_lite.git
synced 2026-07-18 17:54:39 -04:00
Merge branch 'master' of https://gitee.com/lugitee/bundlemanager_bundle_framework_lite_1
Signed-off-by: hanlu1@huawei.com <hanlu1@huawei.com>
This commit is contained in:
@@ -38,8 +38,12 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user