ReVanced/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-04-30 22:24:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged in v1.3.4 smali/baksmaili/dexlib. Updated doc to reflect github

Browse Source
This commit is contained in:
Connor Tumbleson 2012-08-29 17:24:35 -05:00
parent ca0f7ec0bb
commit fa2afc3598
6 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apktool-cli/pom.xml
View File

@ -49,6 +49,12 @@
<groupId>${project.groupId}</groupId>
<artifactId>apktool-lib</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>baksmali</artifactId>
<groupId>brut.apktool.smali</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<artifactId>common</artifactId>
@ -62,5 +68,10 @@
<version>1.3.4-ibot7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>brut.apktool.smali</groupId>
<artifactId>baksmali</artifactId>
<version>1.3.4-ibot8</version>
</dependency>
</dependencies>
</project>

2
apktool-cli/src/main/java/brut/apktool/Main.java
View File

@ -263,7 +263,7 @@ public class Main {
" if|install-framework <framework.apk> [<tag>]\n" +
" Install framework file to your system.\n" +
"\n" +
"For additional info, see: http://code.google.com/p/android-apktool/"
"For additional info, see: https://github.com/iBotPeaches/brut.apktool"
);
}

32
apktool-lib/pom.xml
View File

@ -80,17 +80,6 @@
<artifactId>common</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>brut.apktool.smali</groupId>
<artifactId>smali</artifactId>
<version>${smaliVersion}</version>
</dependency>
<dependency>
<groupId>brut.apktool.smali</groupId>
<artifactId>baksmali</artifactId>
<version>1.3.4-ibot7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>brut.apktool.smali</groupId>
<artifactId>util</artifactId>
@ -122,12 +111,6 @@
<artifactId>xmlunit</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>brut.apktool.smali</groupId>
<artifactId>dexlib</artifactId>
<version>1.3.4-ibot7</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@ -140,6 +123,21 @@
<version>3.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>brut.apktool.smali</groupId>
<artifactId>baksmali</artifactId>
<version>1.3.4-ibot8</version>
</dependency>
<dependency>
<groupId>brut.apktool.smali</groupId>
<artifactId>dexlib</artifactId>
<version>1.3.4-ibot8</version>
</dependency>
<dependency>
<groupId>brut.apktool.smali</groupId>
<artifactId>smali</artifactId>
<version>1.3.4-ibot8</version>
</dependency>
</dependencies>
<pluginRepositories>
<pluginRepository>

1
apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java
View File

@ -21,6 +21,7 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jf.dexlib.Code.Analysis.RegisterType;
import org.jf.dexlib.Code.Opcode;
/**
* @author Ryszard Wiśniewski <brut.alll@gmail.com>

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

@ -44,7 +44,7 @@ public class SmaliDecoder {
baksmali.disassembleDexFile(mApkFile.getAbsolutePath(),
new DexFile(mApkFile), false, mOutDir.getAbsolutePath(), null,
null, null, false, true, true, true, false, false,
mDebug ? main.ALLPRE : 0, false, false, null);
mDebug ? main.FULLMERGE : 0, false, false, null);
} catch (IOException ex) {
throw new AndrolibException(ex);
}

4
pom.xml
View File

@ -17,6 +17,10 @@
<modules>
<module>apktool-lib</module>
<module>apktool-cli</module>
<module>../brut.apktool.smali</module>
<module>../brut.j.dir</module>
<module>../brut.j.common</module>
<module>../brut.j.util</module>
</modules>
<build>