From 1472dbb2918bbd607a609df6989d0ceb34c33049 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 22 Dec 2017 16:10:38 +0800 Subject: [PATCH] Add cache magisk image merging support --- core/jni/core/bootstages.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/jni/core/bootstages.c b/core/jni/core/bootstages.c index c60197317..711117fdb 100644 --- a/core/jni/core/bootstages.c +++ b/core/jni/core/bootstages.c @@ -394,6 +394,10 @@ static void simple_mount(const char *path) { static int prepare_img() { // First merge images + if (merge_img("/cache/magisk.img", MAINIMG)) { + LOGE("Image merge /cache/magisk.img -> " MAINIMG " failed!\n"); + return 1; + } if (merge_img("/data/magisk_merge.img", MAINIMG)) { LOGE("Image merge /data/magisk_merge.img -> " MAINIMG " failed!\n"); return 1;