mirror of
https://github.com/revanced/Apktool.git
synced 2024-08-17 12:50:27 +02:00
Merge pull request #2132 from iBotPeaches/danielmalmq-master
Added new option to skip non classes[0-9]*.dex files
This commit is contained in:
commit
2c8ea97899
@ -112,6 +112,9 @@ public class Main {
|
|||||||
if (cli.hasOption("s") || cli.hasOption("no-src")) {
|
if (cli.hasOption("s") || cli.hasOption("no-src")) {
|
||||||
decoder.setDecodeSources(ApkDecoder.DECODE_SOURCES_NONE);
|
decoder.setDecodeSources(ApkDecoder.DECODE_SOURCES_NONE);
|
||||||
}
|
}
|
||||||
|
if (cli.hasOption("only-main-classes")) {
|
||||||
|
decoder.setDecodeSources(ApkDecoder.DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES);
|
||||||
|
}
|
||||||
if (cli.hasOption("d") || cli.hasOption("debug")) {
|
if (cli.hasOption("d") || cli.hasOption("debug")) {
|
||||||
System.err.println("SmaliDebugging has been removed in 2.1.0 onward. Please see: https://github.com/iBotPeaches/Apktool/issues/1061");
|
System.err.println("SmaliDebugging has been removed in 2.1.0 onward. Please see: https://github.com/iBotPeaches/Apktool/issues/1061");
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
@ -309,6 +312,11 @@ public class Main {
|
|||||||
.desc("Do not decode sources.")
|
.desc("Do not decode sources.")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
Option onlyMainClassesOption = Option.builder()
|
||||||
|
.longOpt("only-main-classes")
|
||||||
|
.desc("Only disassemble the main dex classes (classes[0-9]*.dex) in the root.")
|
||||||
|
.build();
|
||||||
|
|
||||||
Option noResOption = Option.builder("r")
|
Option noResOption = Option.builder("r")
|
||||||
.longOpt("no-res")
|
.longOpt("no-res")
|
||||||
.desc("Do not decode resources.")
|
.desc("Do not decode resources.")
|
||||||
@ -446,6 +454,7 @@ public class Main {
|
|||||||
DecodeOptions.addOption(noDbgOption);
|
DecodeOptions.addOption(noDbgOption);
|
||||||
DecodeOptions.addOption(keepResOption);
|
DecodeOptions.addOption(keepResOption);
|
||||||
DecodeOptions.addOption(analysisOption);
|
DecodeOptions.addOption(analysisOption);
|
||||||
|
DecodeOptions.addOption(onlyMainClassesOption);
|
||||||
DecodeOptions.addOption(apiLevelOption);
|
DecodeOptions.addOption(apiLevelOption);
|
||||||
DecodeOptions.addOption(noAssetOption);
|
DecodeOptions.addOption(noAssetOption);
|
||||||
DecodeOptions.addOption(forceManOption);
|
DecodeOptions.addOption(forceManOption);
|
||||||
|
@ -144,6 +144,7 @@ public class ApkDecoder {
|
|||||||
mAndrolib.decodeSourcesRaw(mApkFile, outDir, "classes.dex");
|
mAndrolib.decodeSourcesRaw(mApkFile, outDir, "classes.dex");
|
||||||
break;
|
break;
|
||||||
case DECODE_SOURCES_SMALI:
|
case DECODE_SOURCES_SMALI:
|
||||||
|
case DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES:
|
||||||
mAndrolib.decodeSourcesSmali(mApkFile, outDir, "classes.dex", mBakDeb, mApi);
|
mAndrolib.decodeSourcesSmali(mApkFile, outDir, "classes.dex", mBakDeb, mApi);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -162,6 +163,13 @@ public class ApkDecoder {
|
|||||||
case DECODE_SOURCES_SMALI:
|
case DECODE_SOURCES_SMALI:
|
||||||
mAndrolib.decodeSourcesSmali(mApkFile, outDir, file, mBakDeb, mApi);
|
mAndrolib.decodeSourcesSmali(mApkFile, outDir, file, mBakDeb, mApi);
|
||||||
break;
|
break;
|
||||||
|
case DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES:
|
||||||
|
if (file.startsWith("classes") && file.endsWith(".dex")) {
|
||||||
|
mAndrolib.decodeSourcesSmali(mApkFile, outDir, file, mBakDeb, mApi);
|
||||||
|
} else {
|
||||||
|
mAndrolib.decodeSourcesRaw(mApkFile, outDir, file);
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -184,7 +192,7 @@ public class ApkDecoder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setDecodeSources(short mode) throws AndrolibException {
|
public void setDecodeSources(short mode) throws AndrolibException {
|
||||||
if (mode != DECODE_SOURCES_NONE && mode != DECODE_SOURCES_SMALI) {
|
if (mode != DECODE_SOURCES_NONE && mode != DECODE_SOURCES_SMALI && mode != DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES) {
|
||||||
throw new AndrolibException("Invalid decode sources mode: " + mode);
|
throw new AndrolibException("Invalid decode sources mode: " + mode);
|
||||||
}
|
}
|
||||||
mDecodeSources = mode;
|
mDecodeSources = mode;
|
||||||
@ -316,6 +324,7 @@ public class ApkDecoder {
|
|||||||
|
|
||||||
public final static short DECODE_SOURCES_NONE = 0x0000;
|
public final static short DECODE_SOURCES_NONE = 0x0000;
|
||||||
public final static short DECODE_SOURCES_SMALI = 0x0001;
|
public final static short DECODE_SOURCES_SMALI = 0x0001;
|
||||||
|
public final static short DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES = 0x0010;
|
||||||
|
|
||||||
public final static short DECODE_RESOURCES_NONE = 0x0100;
|
public final static short DECODE_RESOURCES_NONE = 0x0100;
|
||||||
public final static short DECODE_RESOURCES_FULL = 0x0101;
|
public final static short DECODE_RESOURCES_FULL = 0x0101;
|
||||||
|
@ -0,0 +1,75 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2019 Ryszard Wiśniewski <brut.alll@gmail.com>
|
||||||
|
* Copyright (C) 2019 Connor Tumbleson <connor.tumbleson@gmail.com>
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package brut.androlib.decode;
|
||||||
|
|
||||||
|
import brut.androlib.*;
|
||||||
|
import brut.common.BrutException;
|
||||||
|
import brut.directory.ExtFile;
|
||||||
|
import brut.util.OS;
|
||||||
|
import org.junit.*;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
||||||
|
public class DuplicateDexTest extends BaseTest {
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void beforeClass() throws Exception {
|
||||||
|
TestUtils.cleanFrameworkFile();
|
||||||
|
sTmpDir = new ExtFile(OS.createTempDirectory());
|
||||||
|
sTestOrigDir = new ExtFile(sTmpDir, "duplicatedex-orig");
|
||||||
|
sTestNewDir = new ExtFile(sTmpDir, "duplicatedex-new");
|
||||||
|
LOGGER.info("Unpacking duplicatedex.apk...");
|
||||||
|
TestUtils.copyResourceDir(DuplicateDexTest.class, "decode/duplicatedex", sTestOrigDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void afterClass() throws BrutException {
|
||||||
|
OS.rmdir(sTmpDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(expected = AndrolibException.class)
|
||||||
|
public void decodeAllSourcesShouldThrowException() throws BrutException, IOException {
|
||||||
|
File testApk = new File(sTestOrigDir, "duplicatedex.apk");
|
||||||
|
|
||||||
|
LOGGER.info("Decoding duplicatedex.apk...");
|
||||||
|
ApkDecoder apkDecoder = new ApkDecoder(testApk);
|
||||||
|
apkDecoder.setOutDir(sTestNewDir);
|
||||||
|
apkDecoder.decode();
|
||||||
|
|
||||||
|
LOGGER.info("Building duplicatedex.apk...");
|
||||||
|
ApkOptions apkOptions = new ApkOptions();
|
||||||
|
new Androlib(apkOptions).build(sTestNewDir, testApk);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void decodeUsingOnlyMainClassesMode() throws BrutException, IOException {
|
||||||
|
File testApk = new File(sTestOrigDir, "duplicatedex.apk");
|
||||||
|
|
||||||
|
LOGGER.info("Decoding duplicatedex.apk...");
|
||||||
|
ApkDecoder apkDecoder = new ApkDecoder(testApk);
|
||||||
|
apkDecoder.setDecodeSources(ApkDecoder.DECODE_SOURCES_SMALI_ONLY_MAIN_CLASSES);
|
||||||
|
apkDecoder.setOutDir(sTestNewDir);
|
||||||
|
apkDecoder.decode();
|
||||||
|
|
||||||
|
LOGGER.info("Building duplicatedex.apk...");
|
||||||
|
ApkOptions apkOptions = new ApkOptions();
|
||||||
|
new Androlib(apkOptions).build(sTestNewDir, testApk);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user