ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-01-06 10:05:54 +01:00
Code Issues Projects Releases Wiki Activity

Keep baksmali options same as previous apktool

Browse Source
This commit is contained in:
Connor Tumbleson 2017-04-25 08:42:01 -04:00
parent 1180948e2c
commit 2d5337d3cb
No known key found for this signature in database
GPG Key ID: C3CC0A201EC7DA75
4 changed files with 152 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
View File

@ -48,12 +48,12 @@ public class SmaliDecoder {
private void decode() throws AndrolibException {
try {
BaksmaliOptions options = new BaksmaliOptions();
final BaksmaliOptions options = new BaksmaliOptions();
// options
options.deodex = false;
options.implicitReferences = false;
options.parameterRegisters = false;
options.parameterRegisters = true;
options.localsDirective = true;
options.sequentialLabels = true;
options.debugInfo = mBakDeb;

103
brut.apktool/apktool-lib/src/test/java/brut/androlib/DefaultBaksmaliVariableTest.java Normal file
View File

@ -0,0 +1,103 @@
package brut.androlib;
import brut.common.BrutException;
import brut.directory.ExtFile;
import brut.util.OS;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.logging.Logger;
import static org.junit.Assert.assertEquals;
public class DefaultBaksmaliVariableTest {
@BeforeClass
public static void beforeClass() throws Exception, BrutException {
sTmpDir = new ExtFile(OS.createTempDirectory());
sTestOrigDir = new ExtFile(sTmpDir, "testjar-orig");
sTestNewDir = new ExtFile(sTmpDir, "testjar-new");
LOGGER.info("Unpacking testjar...");
TestUtils.copyResourceDir(BuildAndDecodeJarTest.class, "brut/apktool/issue1481/", sTestOrigDir);
LOGGER.info("Building issue1481.jar...");
File testJar = new File(sTmpDir, "issue1481.jar");
new Androlib().build(sTestOrigDir, testJar);
LOGGER.info("Decoding issue1481.jar...");
ApkDecoder apkDecoder = new ApkDecoder(testJar);
apkDecoder.setOutDir(sTestNewDir);
apkDecoder.decode();
}
@AfterClass
public static void afterClass() throws BrutException {
OS.rmdir(sTmpDir);
}
@Test
public void confirmBaksmaliParamsAreTheSame() throws BrutException, IOException {
String expected = TestUtils.replaceNewlines(".class public final Lcom/ibotpeaches/issue1481/BuildConfig;\n" +
".super Ljava/lang/Object;\n" +
".source \"BuildConfig.java\"\n" +
"\n" +
"\n" +
"# static fields\n" +
".field public static final APPLICATION_ID:Ljava/lang/String; = \"com.ibotpeaches.issue1481\"\n" +
"\n" +
".field public static final BUILD_TYPE:Ljava/lang/String; = \"debug\"\n" +
"\n" +
".field public static final DEBUG:Z\n" +
"\n" +
".field public static final FLAVOR:Ljava/lang/String; = \"\"\n" +
"\n" +
".field public static final VERSION_CODE:I = 0x1\n" +
"\n" +
".field public static final VERSION_NAME:Ljava/lang/String; = \"1.0\"\n" +
"\n" +
"\n" +
"# direct methods\n" +
".method static constructor <clinit>()V\n" +
" .locals 1\n" +
"\n" +
" .prologue\n" +
" .line 7\n" +
" const-string v0, \"true\"\n" +
"\n" +
" invoke-static {v0}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z\n" +
"\n" +
" move-result v0\n" +
"\n" +
" sput-boolean v0, Lcom/ibotpeaches/issue1481/BuildConfig;->DEBUG:Z\n" +
"\n" +
" return-void\n" +
".end method\n" +
"\n" +
".method public constructor <init>()V\n" +
" .locals 0\n" +
"\n" +
" .prologue\n" +
" .line 6\n" +
" invoke-direct {p0}, Ljava/lang/Object;-><init>()V\n" +
"\n" +
" return-void\n" +
".end method");
byte[] encoded = Files.readAllBytes(Paths.get(sTestNewDir + File.separator + "smali" + File.separator
+ "com" + File.separator + "ibotpeaches" + File.separator + "issue1481" + File.separator + "BuildConfig.smali"));
String obtained = TestUtils.replaceNewlines(new String(encoded));
assertEquals(expected, obtained);
}
private static ExtFile sTmpDir;
private static ExtFile sTestOrigDir;
private static ExtFile sTestNewDir;
private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName());
}

2
brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1481/apktool.yml Normal file
View File

@ -0,0 +1,2 @@
version: 2.2.3
apkFileName: issue1481.jar

45
brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1481/smali/com/ibotpeaches/issue1481/BuildConfig.smali Normal file
View File

@ -0,0 +1,45 @@
.class public final Lcom/ibotpeaches/issue1481/BuildConfig;
.super Ljava/lang/Object;
.source "BuildConfig.java"
# static fields
.field public static final APPLICATION_ID:Ljava/lang/String; = "com.ibotpeaches.issue1481"
.field public static final BUILD_TYPE:Ljava/lang/String; = "debug"
.field public static final DEBUG:Z
.field public static final FLAVOR:Ljava/lang/String; = ""
.field public static final VERSION_CODE:I = 0x1
.field public static final VERSION_NAME:Ljava/lang/String; = "1.0"
# direct methods
.method static constructor <clinit>()V
.registers 1
.prologue
.line 7
const-string v0, "true"
invoke-static {v0}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z
move-result v0
sput-boolean v0, Lcom/ibotpeaches/issue1481/BuildConfig;->DEBUG:Z
return-void
.end method
.method public constructor <init>()V
.registers 1
.prologue
.line 6
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
return-void
.end method