From 7de8e7a727e8318b86a9d29b385453b568d61495 Mon Sep 17 00:00:00 2001 From: zhoumengjie Date: Fri, 19 Apr 2024 11:59:33 +0800 Subject: [PATCH] move memmgr_plugin to memmgr_override Signed-off-by: zhoumengjie Change-Id: I66b2f1409c801e10e2c39e1692e142b79a854a40 --- bundle.json | 2 +- multimedia_camera_framework.gni | 4 ++-- services/camera_service/BUILD.gn | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundle.json b/bundle.json index 6de6cf6a8..2bc25d7da 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 a600cc607..adb07bce5 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 83598bb0d..009c2901e 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" ] } -- Gitee