Add LOKI support #11

xakep666 · 2017-01-23T11:08:40Z

add "lokiaboot" and "lokipatch" partition properties to fstab
patch partitions marked as "lokipatch" before flashing

M1cha · 2017-01-23T11:49:29Z

did you test this?
Since the app is not running as root, it shouldn't be able to read the data of the aboot partition directly.

xakep666 · 2017-01-23T11:52:29Z

It uses existing backup code to read aboot partition and place it dump to esp. Loki reads this file, not partition.

M1cha · 2017-01-23T11:59:37Z

oh but you're writing that temporary backup to the ESP even though the partition is not being changed(it's information is just used to patch boot/recovery).

You should put the backup in the apps temporary folder instead and delete it when you're done.

xakep666 · 2017-01-23T13:03:25Z

Made a dumping bootloader to getCacheDir() and removing when installation finishes

M1cha · 2017-01-23T13:26:14Z

app/src/main/java/org/efidroid/efidroidmanager/types/FSTabEntry.java

@@ -105,6 +105,26 @@ public boolean isMultiboot() {
        return false;
    }

+    public boolean isLokiAboot() {


the name should be 'isLokiABoot' because A is for Android and B is for Bootloader.

M1cha · 2017-01-23T13:26:31Z

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

+
+                String file = updateDir + "/" + entry.getName() + ".img";
+
+                //if needed, apply LOKI patch to boot and recovery partitions


add a space after //

M1cha · 2017-01-23T13:26:39Z

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

+                    RootToolsEx.dd(file, entry.getBlkDevice());
+            }
+        } finally {
+            //remove bootloader dump


add a space after //

M1cha · 2017-01-23T13:26:46Z

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

@@ -161,13 +176,36 @@ private void doInstall(String updateDir) throws Exception {
            }
        }

-        // install
+        //dump bootloader to temporary folder


add a space after //

M1cha · 2017-01-23T13:26:54Z

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

+    }
+
+    public static boolean flashImage(PartitionLabel label, String image) {
+        //root required for flashing


add a space after //

M1cha · 2017-01-23T13:27:45Z

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

+
+        String mLabel;
+        PartitionLabel(String s) {
+            mLabel=s;


space before and after =

M1cha · 2017-01-23T13:28:03Z

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

+    private LokiTool() {}
+
+    private static native int lokiPatch(String partitionLabel, String bootloaderImage,
+                                     String inImage, String outImage);


this linebreak looks weird

M1cha · 2017-01-23T13:28:06Z

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

+    private static native int lokiFlash(String partitionLabel, String image);
+
+    public static boolean patchImage(PartitionLabel label, String bootloaderImage,
+                              String inImage, String outImage) {


this linebreak looks weird

M1cha · 2017-01-23T13:28:29Z

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

@@ -114,6 +118,17 @@ private String downloadUpdate(String urlString) throws Exception {
        return downloadDir;
    }

+    private static void lokiPatchAndFlash(LokiTool.PartitionLabel partition,
+                                   String bootloaderImage, String fileToPatch) throws Exception {


this linebreak looks weird

M1cha · 2017-01-23T13:29:19Z

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

+                String file = updateDir + "/" + entry.getName() + ".img";
+
+                //if needed, apply LOKI patch to boot and recovery partitions
+                if (entry.isLokiPatch() &&


pls use nested if's to remove the duplicate condition 'isLokiPatch'

M1cha

you should run AndroidStudio's auto-formatting tool on all the files which would make the changes I've requested much easier.

xakep666 · 2017-01-23T19:12:20Z

Improved encapsulation in "partitionlabel" enum, fixed formatting

M1cha

see my comments

M1cha · 2017-01-23T19:24:13Z

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

+        // root required for flashing
+        boolean isRootAccess = RootTools.isAccessGiven();
+        if (!isRootAccess) {
+            Log.e(TAG, "flashImage: cannot get root privileges");


Sry that I missed this previously, but why are you using the volley logtag here?
Also why are you checking for root in first place?

it has already been done at this point

the call to lokiFlash doesn't need root.

About tag: autocompleted at "loge"

Root required because of native library writes new boot and recovery parts

and where does this happen? NDK-code does not run as root and cannot write to any partitions.

https://github.com/efidroid/modules_loki/blob/master/loki_flash.c#L133

well unless your ROM uses super insecure permissions and selinux is disabled this line will always fail.

You mean I have to use RootToolsEx.dd() to flash patched parts

either that or you have to compile loki as a statically linked binary like busybox and run it as root.
So, didn't you test your change yet? Because such a mistake should have been noticed.

I have no device to test this tool. Also, at first idea was compiling loki_tool. Now I think, maybe just place precompiled binary into "assets" and call it

xakep666 · 2017-01-23T21:38:31Z

Rewrote using separate binary (runs on my device)

M1cha · 2017-01-24T06:15:16Z

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

+        try {
+            InputStream is = null;
+            try {
+                is = context.getAssets().open("armeabi-v7a/loki_tool_static");


this binary isn't statically linked. Linking it dynamically actually isn't such a bad idea because it makes the file size much smaller. But what about compatibility? we need to support 4.0+.
Also, is it possible to build binaries with gradle+ndk? The only reason I'm using busybox prebuilt is that it doesn't work that well when compiled using the ndk and still needs to be built using autoconf anyway.

Either way, we don't include the link-type in the filename.

I didn't find way to build and add binary to apk using gradle.
I built it with ndk-build which uses Android.mk included in sources.

M1cha

see my comments

M1cha · 2017-01-24T06:18:09Z

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

+            abis.add(Build.CPU_ABI2);
+        }
+        // do not initialize on non-arm cpu
+        if (!abis.contains("armeabi-v7a")) return;


You should rather make the original code for busybox reusable, also don't limit this to ARM.
If you do this you can also keep this code inside RootToolsEx since this implementation shouldn't have to care about where the binary comes from.

This tool is usable only for arm-based phones.
See https://github.com/efidroid/modules_loki/blob/master/loki_patch.c#L30

FSTabEntry: getFfMgrFlags() returns list of flags. Rewrite isMultiboot(), isUEFI(), getESP() using it Move ABIs retrieving code to separate method getABIs() in Util Add universal image patching interface Add image patching (if needed) before flashing. Add LOKI as git submodule Add LOKI image patcher using NDK

xakep666 force-pushed the master branch 2 times, most recently from 65e0669 to 3c1b210 Compare January 23, 2017 11:13

xakep666 force-pushed the master branch 2 times, most recently from 1fdcc4c to e67fd8e Compare January 23, 2017 13:01

xakep666 force-pushed the master branch from e67fd8e to 38ca410 Compare January 23, 2017 13:05

M1cha reviewed Jan 23, 2017

View reviewed changes

M1cha requested changes Jan 23, 2017

View reviewed changes

xakep666 force-pushed the master branch 4 times, most recently from d5bb80e to 9e95e7f Compare January 23, 2017 15:26

M1cha requested changes Jan 23, 2017

View reviewed changes

xakep666 force-pushed the master branch from 9e95e7f to a478918 Compare January 23, 2017 21:29

xakep666 force-pushed the master branch 2 times, most recently from 0ed76f6 to 57272fa Compare January 23, 2017 22:17

M1cha reviewed Jan 24, 2017

View reviewed changes

M1cha requested changes Jan 24, 2017

View reviewed changes

xakep666 force-pushed the master branch 2 times, most recently from da42dcd to 24cb84c Compare February 14, 2017 09:19

xakep666 force-pushed the master branch from 24cb84c to d67b716 Compare February 14, 2017 09:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add LOKI support #11

Add LOKI support #11

xakep666 commented Jan 23, 2017 •

edited

Loading

M1cha commented Jan 23, 2017

xakep666 commented Jan 23, 2017

M1cha commented Jan 23, 2017

xakep666 commented Jan 23, 2017

M1cha Jan 23, 2017

M1cha Jan 23, 2017

M1cha Jan 23, 2017

M1cha Jan 23, 2017

M1cha Jan 23, 2017

M1cha Jan 23, 2017

M1cha Jan 23, 2017

M1cha Jan 23, 2017

M1cha Jan 23, 2017

M1cha Jan 23, 2017

M1cha left a comment

xakep666 commented Jan 23, 2017 •

edited

Loading

M1cha left a comment

M1cha Jan 23, 2017

xakep666 Jan 23, 2017

xakep666 Jan 23, 2017

M1cha Jan 23, 2017

xakep666 Jan 23, 2017

M1cha Jan 23, 2017

xakep666 Jan 23, 2017

M1cha Jan 23, 2017

xakep666 Jan 23, 2017

xakep666 commented Jan 23, 2017

M1cha Jan 24, 2017 •

edited

Loading

xakep666 Jan 24, 2017

M1cha left a comment

M1cha Jan 24, 2017

xakep666 Jan 24, 2017


		String file = updateDir + "/" + entry.getName() + ".img";

		//if needed, apply LOKI patch to boot and recovery partitions

Add LOKI support #11

Are you sure you want to change the base?

Add LOKI support #11

Conversation

xakep666 commented Jan 23, 2017 • edited Loading

M1cha commented Jan 23, 2017

xakep666 commented Jan 23, 2017

M1cha commented Jan 23, 2017

xakep666 commented Jan 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

M1cha left a comment

Choose a reason for hiding this comment

xakep666 commented Jan 23, 2017 • edited Loading

M1cha left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xakep666 commented Jan 23, 2017

M1cha Jan 24, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

M1cha left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xakep666 commented Jan 23, 2017 •

edited

Loading

xakep666 commented Jan 23, 2017 •

edited

Loading

M1cha Jan 24, 2017 •

edited

Loading