feat: rip-lib and unsigned

Blawuken · Dec 28, 2023 · daece06 · daece06
1 parent 2d48607
commit daece06
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/revanced-cli/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt b/revanced-cli/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt
@@ -147,6 +147,18 @@ internal object PatchCommand : Runnable {
 
     private var aaptBinaryPath: File? = null
 
+    @CommandLine.Option(
+        names = ["--unsigned"],
+        description = ["Disable signing of the final apk."],
+    )
+    private var unsigned: Boolean = false
+
+    @CommandLine.Option(
+        names = ["--rip-lib"],
+        description = ["Rip native libs from APK."],
+    )
+    private var ripLibs = arrayOf<String>()
+
     @CommandLine.Option(
         names = ["-p", "--purge"],
         description = ["Purge the temporary resource cache directory after patching."],
@@ -306,10 +318,10 @@ internal object PatchCommand : Runnable {
 
             val alignedFile =
                 resourceCachePath.resolve(apk.name).apply {
-                    ApkUtils.copyAligned(apk, this, patcherResult)
+                    ApkUtils.copyAligned(apk, this, patcherResult, ripLibs)
                 }
 
-            if (!mount) {
+            if (!mount && !unsigned) {
                 ApkUtils.sign(
                     alignedFile,
                     outputFilePath,

diff --git a/revanced-lib/src/main/kotlin/app/revanced/library/ApkUtils.kt b/revanced-lib/src/main/kotlin/app/revanced/library/ApkUtils.kt
@@ -21,11 +21,13 @@ object ApkUtils {
      * @param apkFile The apk to copy entries from.
      * @param outputFile The apk to write the new entries to.
      * @param patchedEntriesSource The result of the patcher to add the patched dex files and resources.
+     * @param exclude An array of libraries to remove.
      */
     fun copyAligned(
         apkFile: File,
         outputFile: File,
         patchedEntriesSource: PatcherResult,
+        exclude: Array<String>
     ) {
         logger.info("Aligning ${apkFile.name}")
 
@@ -49,8 +51,10 @@ object ApkUtils {
             // TODO: Do not compress result.doNotCompress
 
             // TODO: Fix copying resources that are not needed anymore.
+            val inputZipFile = ZipFile(apkFile)
+            inputZipFile.entries.removeIf { entry -> exclude.any { entry.fileName.startsWith("lib/$it") } }
             file.copyEntriesFromFileAligned(
-                ZipFile(apkFile),
+                inputZipFile,
                 ZipFile.apkZipEntryAlignment,
             )
         }

diff --git a/revanced-lib/src/main/kotlin/app/revanced/library/zip/ZipFile.kt b/revanced-lib/src/main/kotlin/app/revanced/library/zip/ZipFile.kt
@@ -11,7 +11,7 @@ import java.util.zip.CRC32
 import java.util.zip.Deflater
 
 class ZipFile(file: File) : Closeable {
-    private var entries: MutableList<ZipEntry> = mutableListOf()
+    var entries: MutableList<ZipEntry> = mutableListOf()
 
     // Open file for writing if it doesn't exist (because the intention is to write) or is writable.
     private val filePointer: RandomAccessFile =