ReVanced/revanced-patcher
1
0
Fork 0
mirror of https://github.com/revanced/revanced-patcher.git synced 2025-05-01 05:44:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add option to use single threaded writer for dex files

Browse Source 
BREAKING CHANGE: This commit gets rid of deprecated constructors.
This commit is contained in:
oSumAtrIX 2023-10-09 04:10:20 +02:00
parent cb5e39d73e
commit 77dbee3d6a
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
3 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
revanced-patcher/api/revanced-patcher.api
View File

@ -67,10 +67,10 @@ public final class app/revanced/patcher/PatcherException$CircularDependencyExcep
public final class app/revanced/patcher/PatcherOptions { public final class app/revanced/patcher/PatcherOptions {
public fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;)V public fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;)V
public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patcher/logging/Logger;)V public fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Z)V
public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patcher/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun copy (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patcher/logging/Logger;)Lapp/revanced/patcher/PatcherOptions; public final fun copy (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Z)Lapp/revanced/patcher/PatcherOptions;
public static synthetic fun copy$default (Lapp/revanced/patcher/PatcherOptions;Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patcher/logging/Logger;ILjava/lang/Object;)Lapp/revanced/patcher/PatcherOptions; public static synthetic fun copy$default (Lapp/revanced/patcher/PatcherOptions;Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Lapp/revanced/patcher/PatcherOptions;
public fun equals (Ljava/lang/Object;)Z public fun equals (Ljava/lang/Object;)Z
public fun hashCode ()I public fun hashCode ()I
public final fun recreateResourceCacheDirectory ()Ljava/io/File; public final fun recreateResourceCacheDirectory ()Ljava/io/File;

13
revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt
View File

@ -1,7 +1,6 @@
package app.revanced.patcher package app.revanced.patcher
import app.revanced.patcher.data.ResourceContext import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.logging.impl.NopLogger
import brut.androlib.Config import brut.androlib.Config
import java.io.File import java.io.File
import java.util.logging.Logger import java.util.logging.Logger
@ -12,16 +11,15 @@ import java.util.logging.Logger
* @param resourceCachePath The path to the directory to use for caching resources. * @param resourceCachePath The path to the directory to use for caching resources.
* @param aaptBinaryPath The path to a custom aapt binary. * @param aaptBinaryPath The path to a custom aapt binary.
* @param frameworkFileDirectory The path to the directory to cache the framework file in. * @param frameworkFileDirectory The path to the directory to cache the framework file in.
* @param unusedLogger The logger to use for logging. * @param multithreadingDexFileWriter Whether to use multiple threads for writing dex files.
* This can impact memory usage.
*/ */
data class PatcherOptions data class PatcherOptions(
@Deprecated("Use the constructor without the logger parameter instead")
constructor(
internal val inputFile: File, internal val inputFile: File,
internal val resourceCachePath: File = File("revanced-resource-cache"), internal val resourceCachePath: File = File("revanced-resource-cache"),
internal val aaptBinaryPath: String? = null, internal val aaptBinaryPath: String? = null,
internal val frameworkFileDirectory: String? = null, internal val frameworkFileDirectory: String? = null,
internal val unusedLogger: app.revanced.patcher.logging.Logger = NopLogger internal val multithreadingDexFileWriter: Boolean = false,
) { ) {
private val logger = Logger.getLogger(PatcherOptions::class.java.name) private val logger = Logger.getLogger(PatcherOptions::class.java.name)
@ -47,6 +45,7 @@ constructor(
* @param aaptBinaryPath The path to a custom aapt binary. * @param aaptBinaryPath The path to a custom aapt binary.
* @param frameworkFileDirectory The path to the directory to cache the framework file in. * @param frameworkFileDirectory The path to the directory to cache the framework file in.
*/ */
@Deprecated("Use the constructor with the multithreadingDexFileWriter parameter instead")
constructor( constructor(
inputFile: File, inputFile: File,
resourceCachePath: File = File("revanced-resource-cache"), resourceCachePath: File = File("revanced-resource-cache"),
@ -57,7 +56,7 @@ constructor(
resourceCachePath, resourceCachePath,
aaptBinaryPath, aaptBinaryPath,
frameworkFileDirectory, frameworkFileDirectory,
NopLogger false,
) )
fun recreateResourceCacheDirectory() = resourceCachePath.also { fun recreateResourceCacheDirectory() = resourceCachePath.also {

25
revanced-patcher/src/main/kotlin/app/revanced/patcher/data/BytecodeContext.kt
View File

@ -12,11 +12,11 @@ import com.android.tools.smali.dexlib2.Opcodes
import com.android.tools.smali.dexlib2.iface.ClassDef import com.android.tools.smali.dexlib2.iface.ClassDef
import com.android.tools.smali.dexlib2.iface.DexFile import com.android.tools.smali.dexlib2.iface.DexFile
import com.android.tools.smali.dexlib2.iface.Method import com.android.tools.smali.dexlib2.iface.Method
import com.android.tools.smali.dexlib2.writer.io.MemoryDataStore
import lanchon.multidexlib2.BasicDexFileNamer import lanchon.multidexlib2.BasicDexFileNamer
import lanchon.multidexlib2.DexIO import lanchon.multidexlib2.DexIO
import lanchon.multidexlib2.MultiDexIO import lanchon.multidexlib2.MultiDexIO
import java.io.File import java.io.File
import java.io.FileFilter
import java.io.Flushable import java.io.Flushable
import java.util.logging.Logger import java.util.logging.Logger
@ -142,16 +142,25 @@ class BytecodeContext internal constructor(private val options: PatcherOptions)
* @return The compiled bytecode. * @return The compiled bytecode.
*/ */
override fun get(): List<PatcherResult.PatchedDexFile> { override fun get(): List<PatcherResult.PatchedDexFile> {
logger.info("Compiling modified dex files") logger.info("Compiling patched dex files")
return mutableMapOf<String, MemoryDataStore>().apply { val patchedDexFileResults = options.resourceCachePath.resolve("dex").also {
it.deleteRecursively() // Make sure the directory is empty.
it.mkdirs()
}.apply {
MultiDexIO.writeDexFile( MultiDexIO.writeDexFile(
true, -1, // Defaults to amount of available cores. true,
this, BasicDexFileNamer(), object : DexFile { if (options.multithreadingDexFileWriter) -1 else 1,
this,
BasicDexFileNamer(),
object : DexFile {
override fun getClasses() = this@BytecodeContext.classes.also(ProxyClassList::replaceClasses) override fun getClasses() = this@BytecodeContext.classes.also(ProxyClassList::replaceClasses)
override fun getOpcodes() = this@BytecodeContext.opcodes override fun getOpcodes() = this@BytecodeContext.opcodes
}, DexIO.DEFAULT_MAX_DEX_POOL_SIZE, null },
) DexIO.DEFAULT_MAX_DEX_POOL_SIZE
}.map { PatcherResult.PatchedDexFile(it.key, it.value.readAt(0)) } ) { _, entryName, _ -> logger.info("Compiled $entryName") }
}.listFiles(FileFilter { it.isFile })!!.map { PatcherResult.PatchedDexFile(it.name, it.inputStream()) }
return patchedDexFileResults
} }
} }