From 8cb83acea2776e8a6a1584ae91fe9a191a7fa84b Mon Sep 17 00:00:00 2001 From: Oliver Degener Date: Sun, 25 Apr 2021 13:00:38 +0200 Subject: [PATCH] #24 Instruct dx/baksmali to use Android API version 28 This will prevent dx from failing with SimException messages and allows baksmali to use a wider set of opcodes --- src/main/kotlin/org/ollide/java2smali/Class2DexHelper.kt | 1 + src/main/kotlin/org/ollide/java2smali/Dex2SmaliHelper.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/org/ollide/java2smali/Class2DexHelper.kt b/src/main/kotlin/org/ollide/java2smali/Class2DexHelper.kt index aa8aae7..98018f1 100644 --- a/src/main/kotlin/org/ollide/java2smali/Class2DexHelper.kt +++ b/src/main/kotlin/org/ollide/java2smali/Class2DexHelper.kt @@ -23,6 +23,7 @@ object Class2DexHelper { arguments.outName = outputDexPath arguments.strictNameCheck = false arguments.fileNames = inputClassFilePaths + arguments.minSdkVersion = 28 return try { val returnCode = Main(dxContext).runDx(arguments) diff --git a/src/main/kotlin/org/ollide/java2smali/Dex2SmaliHelper.kt b/src/main/kotlin/org/ollide/java2smali/Dex2SmaliHelper.kt index 295c94c..41f0159 100644 --- a/src/main/kotlin/org/ollide/java2smali/Dex2SmaliHelper.kt +++ b/src/main/kotlin/org/ollide/java2smali/Dex2SmaliHelper.kt @@ -20,7 +20,7 @@ object Dex2SmaliHelper { */ @Throws(IOException::class) fun disassembleDexFile(dexFilePath: String, outputDir: String) { - val opCodes = Opcodes.getDefault() + val opCodes = Opcodes.forApi(28) val dexBackedDexFile = DexFileFactory.loadDexFile(dexFilePath, opCodes) val options = BaksmaliOptions()