diff --git a/bundle.json b/bundle.json index 6de6cf6a873957f8827491d982747087f964c28a..2bc25d7da73ecea611f9fcaffec0cd8414742f86 100644 --- a/bundle.json +++ b/bundle.json @@ -48,7 +48,7 @@ "thermal_manager", "window_manager", "memmgr", - "memmgr_plugin" + "memmgr_override" ], "third_party": [ ] diff --git a/multimedia_camera_framework.gni b/multimedia_camera_framework.gni index a600cc607df34da394e3b58ae104988b9776a9e1..adb07bce5fd475596b543f646cbdea93b13a5c7a 100644 --- a/multimedia_camera_framework.gni +++ b/multimedia_camera_framework.gni @@ -22,11 +22,11 @@ driver_disply_path = "//drivers/peripheral/display" window_manager_path = "//foundation/window/window_manager" system_safwk_path = "//utils/system/safwk" memmgr_root = "//foundation/resourceschedule/memmgr" -memmgr_plugin_root = "//foundation/resourceschedule/memmgr_plugin" +memmgr_plugin_root = "//foundation/resourceschedule/memmgr_override" use_memmgr_plugin = false if (defined(global_parts_info) && - defined(global_parts_info.resourceschedule_memmgr_plugin)) { + defined(global_parts_info.resourceschedule_memmgr_override)) { use_memmgr_plugin = true } diff --git a/services/camera_service/BUILD.gn b/services/camera_service/BUILD.gn index 83598bb0dc3c8a186d7ddfc19be858f6882f825b..009c2901edc13c85db453f6f06a229f5617ebd1d 100644 --- a/services/camera_service/BUILD.gn +++ b/services/camera_service/BUILD.gn @@ -136,7 +136,7 @@ ohos_shared_library("camera_service") { } if (use_memmgr_plugin) { - external_deps += [ "memmgr_plugin:memmgrclient" ] + external_deps += [ "memmgr_override:memmgrclient" ] } else if (use_memmgr) { external_deps += [ "memmgr:memmgrclient" ] }