added arm64 versions of Hashtree Patcher, lptools, and magiskboot

Author: capntrips

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.github.capntrips.kernelflasher"
         minSdk 29
         targetSdk 34
-        versionCode 16
-        versionName "1.0.0-alpha16"
+        versionCode 17
+        versionName "1.0.0-alpha17"
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -23,17 +23,23 @@ android {
                 ]
             }
         }
-
+        ndk {
+            abiFilters = ['armeabi-v7a', 'arm64-v8a']
+        }
         vectorDrawables {
             useSupportLibrary true
         }
     }
-
     buildTypes {
         release {
             minifyEnabled false
         }
     }
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['src/main/jniLibs']
+        }
+    }
     buildFeatures {
         aidl true
     }

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
+        android:extractNativeLibs="true"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

app/src/main/assets/httools_static

@@ -3,6 +3,7 @@ package com.github.capntrips.kernelflasher
 import android.animation.ObjectAnimator
 import android.animation.PropertyValuesHolder
 import android.content.ComponentName
+import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.Bundle
@@ -98,6 +99,19 @@ class MainActivity : ComponentActivity() {
         Shell.cmd("chmod +x $dest").exec()
     }
 
+    private fun copyNativeBinary(context: Context, filename: String) {
+        val binary = File(context.applicationInfo.nativeLibraryDir, "lib$filename.so")
+        println("binary: $binary")
+        val dest = File(filesDir, filename)
+        println("dest: $dest")
+        binary.inputStream().use { inputStream ->
+            dest.outputStream().use { outputStream ->
+                inputStream.copyTo(outputStream)
+            }
+        }
+        Shell.cmd("chmod +x $dest").exec()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         WindowCompat.setDecorFitsSystemWindows(window, false)
         val splashScreen = installSplashScreen()
@@ -153,9 +167,9 @@ class MainActivity : ComponentActivity() {
     fun onAidlConnected(fileSystemManager: FileSystemManager) {
         try {
             Shell.cmd("cd $filesDir").exec()
-            copyAsset("lptools_static")
-            copyAsset("httools_static")
-            copyAsset("magiskboot") // version: Magisk 25.2 stable release
+            copyNativeBinary(this, "lptools_static") // v20220825
+            copyNativeBinary(this, "httools_static") // v3.2.0
+            copyNativeBinary(this, "magiskboot") // v25.2
             copyAsset("flash_ak3.sh")
         } catch (e: Exception) {
             Log.e(TAG, e.message, e)

app/src/main/assets/lptools_static

@@ -65,10 +65,6 @@ class SlotViewModel(
     private var inInit = true
     private var _error: String? = null
 
-    @Suppress("PrivatePropertyName")
-    private val STOCK_MAGISKBOOT = "/data/adb/magisk/magiskboot"
-    private var magiskboot: String = STOCK_MAGISKBOOT
-
     val sha1: String
         get() = _sha1!!
     val flashOutput: List<String>
@@ -91,11 +87,7 @@ class SlotViewModel(
     }
 
     fun refresh(context: Context) {
-        // init magiskboot
-        if (!File(STOCK_MAGISKBOOT).exists()) {
-            magiskboot = context.filesDir.absolutePath + File.separator + "magiskboot"
-        }
-
+        val magiskboot = File(context.filesDir, "magiskboot")
         Shell.cmd("$magiskboot unpack $boot").exec()
 
         val ramdisk = File(context.filesDir, "ramdisk.cpio")
@@ -116,23 +108,18 @@ class SlotViewModel(
             }
         }
 
-        val magiskboot = fileSystemManager.getFile(magiskboot)
-        if (magiskboot.exists()) {
-            if (ramdisk.exists()) {
-                when (Shell.cmd("$magiskboot cpio ramdisk.cpio test").exec().code) {
-                    0 -> _sha1 = Shell.cmd("$magiskboot sha1 $boot").exec().out.firstOrNull()
-                    1 -> _sha1 = Shell.cmd("$magiskboot cpio ramdisk.cpio sha1").exec().out.firstOrNull()
-                    else -> log(context, "Invalid ramdisk in boot.img", shouldThrow = true)
-                }
-            } else if (kernel.exists()) {
-                _sha1 = Shell.cmd("$magiskboot sha1 $boot").exec().out.firstOrNull()
-            } else {
-                log(context, "Invalid boot.img, no ramdisk or kernel found", shouldThrow = true)
+        if (ramdisk.exists()) {
+            when (Shell.cmd("$magiskboot cpio ramdisk.cpio test").exec().code) {
+                0 -> _sha1 = Shell.cmd("$magiskboot sha1 $boot").exec().out.firstOrNull()
+                1 -> _sha1 = Shell.cmd("$magiskboot cpio ramdisk.cpio sha1").exec().out.firstOrNull()
+                else -> log(context, "Invalid ramdisk in boot.img", shouldThrow = true)
             }
-            Shell.cmd("$magiskboot cleanup").exec()
+        } else if (kernel.exists()) {
+            _sha1 = Shell.cmd("$magiskboot sha1 $boot").exec().out.firstOrNull()
         } else {
-            log(context, "magiskboot is missing", shouldThrow = true)
+            log(context, "Invalid boot.img, no ramdisk or kernel found", shouldThrow = true)
         }
+        Shell.cmd("$magiskboot cleanup").exec()
 
         PartitionUtil.AvailablePartitions.forEach { partitionName ->
             _backupPartitions[partitionName] = true
@@ -245,6 +232,7 @@ class SlotViewModel(
 
     @Suppress("FunctionName", "SameParameterValue")
     private fun _getKernel(context: Context) {
+        val magiskboot = File(context.filesDir, "magiskboot")
         Shell.cmd("$magiskboot unpack $boot").exec()
         val kernel = File(context.filesDir, "kernel")
         if (kernel.exists()) {