Add LOKI support

add loki_tool_static precompiled binary (armeabi-v7a, position-independent)
add "lokiaboot" and "lokipatch" partition properties to fstab
patch partitions marked as "lokipatch" before flashing

Author: xakep666

app/src/main/assets/armeabi-v7a/loki_tool_static

@@ -0,0 +1,31 @@
+package org.efidroid.efidroidmanager;
+
+import org.efidroid.efidroidmanager.services.IntentServiceEx;
+
+public class LokiTool {
+    public enum PartitionLabel {
+        BOOT("boot"),
+        RECOVERY("recovery");
+
+        private final String mLabel;
+
+        PartitionLabel(String s) {
+            mLabel = s;
+        }
+
+        public String getLabel() {
+            return mLabel;
+        }
+    }
+
+    private LokiTool() {
+    }
+
+    public static void patchImage(IntentServiceEx service, PartitionLabel label, String bootloaderImage, String inImage, String outImage) throws Exception {
+        RootToolsEx.runServiceCommand(service, String.format("loki_tool_static patch %s \"%s\" \"%s\" \"%s\"", label.getLabel(), bootloaderImage, inImage, outImage));
+    }
+
+    public static void flashImage(IntentServiceEx service, PartitionLabel label, String image) throws Exception {
+        RootToolsEx.runServiceCommand(service, String.format("loki_tool_static flash %s \"%s\"", label.getLabel(), image));
+    }
+}

app/src/main/java/org/efidroid/efidroidmanager/LokiTool.java

@@ -3,7 +3,10 @@
 import android.os.Bundle;
 import android.support.annotation.Keep;
 
+import com.stericson.roottools.RootTools;
+
 import org.efidroid.efidroidmanager.AppConstants;
+import org.efidroid.efidroidmanager.LokiTool;
 import org.efidroid.efidroidmanager.R;
 import org.efidroid.efidroidmanager.RootToolsEx;
 import org.efidroid.efidroidmanager.Util;
@@ -17,6 +20,7 @@
 import org.json.JSONObject;
 
 import java.io.BufferedInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -114,6 +118,18 @@ private String downloadUpdate(String urlString) throws Exception {
         return downloadDir;
     }
 
+    private void lokiPatchAndFlash(LokiTool.PartitionLabel partition, String bootloaderImage, String fileToPatch) throws Exception {
+        if (bootloaderImage == null)
+            throw new FileNotFoundException("Cannot find backed up bootloader");
+        String patchedFile = fileToPatch + ".lok";
+        try {
+            LokiTool.patchImage(getService(), partition, bootloaderImage, fileToPatch, patchedFile);
+            LokiTool.flashImage(getService(), partition, patchedFile);
+        } finally {
+            RootTools.deleteFileOrDirectory(patchedFile, false);
+        }
+    }
+
     private void doInstall(String updateDir) throws Exception {
         // get esp parent directory
         String espParent = mDeviceInfo.getESPDir(false);
@@ -161,13 +177,36 @@ private void doInstall(String updateDir) throws Exception {
             }
         }
 
-        // install
+        // dump bootloader to temporary folder
+        String bootloaderImage = null;
         for (FSTabEntry entry : mDeviceInfo.getFSTab().getFSTabEntries()) {
-            if (!entry.isUEFI())
-                continue;
+            if (entry.isLokiABoot()) {
+                bootloaderImage = getService().getCacheDir().getCanonicalPath() + "/bootloader.img";
+                RootToolsEx.createPartitionBackup(getService(), entry.getBlkDevice(), bootloaderImage, -1);
+            }
+        }
 
-            String file = updateDir + "/" + entry.getName() + ".img";
-            RootToolsEx.dd(file, entry.getBlkDevice());
+        // install
+        try {
+            for (FSTabEntry entry : mDeviceInfo.getFSTab().getFSTabEntries()) {
+                if (!entry.isUEFI())
+                    continue;
+
+                String file = updateDir + "/" + entry.getName() + ".img";
+
+                // if needed, apply LOKI patch to boot and recovery partitions
+                if (entry.isLokiPatch()) {
+                    if (entry.getName().equals(LokiTool.PartitionLabel.BOOT.getLabel()))
+                        lokiPatchAndFlash(LokiTool.PartitionLabel.BOOT, bootloaderImage, file);
+                    else if (entry.getName().equals(LokiTool.PartitionLabel.RECOVERY.getLabel()))
+                        lokiPatchAndFlash(LokiTool.PartitionLabel.RECOVERY, bootloaderImage, file);
+                } else {
+                    RootToolsEx.dd(file, entry.getBlkDevice());
+                }
+            }
+        } finally {
+            // remove bootloader dump
+            RootTools.deleteFileOrDirectory(bootloaderImage, false);
         }
     }
 

app/src/main/java/org/efidroid/efidroidmanager/tasks/EFIDroidInstallServiceTask.java

@@ -105,6 +105,26 @@ public boolean isMultiboot() {
         return false;
     }
 
+    public boolean isLokiABoot() {
+        String[] parts = mFfMgrFlags.split(",");
+        for (String part : parts) {
+            if (part.equals("lokiaboot")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isLokiPatch() {
+        String[] parts = mFfMgrFlags.split(",");
+        for (String part : parts) {
+            if (part.equals("lokipatch")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public boolean isUEFI() {
         String[] parts = mFfMgrFlags.split(",");
         for (String part : parts) {