Remove writeCommonSingleThread

This commit is contained in:
Lanchon 2017-09-24 00:21:08 -03:00
parent 0d8047e08f
commit ba40d19575

View File

@ -66,13 +66,6 @@ public class DexIO {
static void writeMultiDexDirectorySingleThread(boolean multiDex, File directory, DexFileNameIterator nameIterator, static void writeMultiDexDirectorySingleThread(boolean multiDex, File directory, DexFileNameIterator nameIterator,
DexFile dexFile, int minMainDexClassCount, boolean minimalMainDex, int maxDexPoolSize, DexIO.Logger logger) DexFile dexFile, int minMainDexClassCount, boolean minimalMainDex, int maxDexPoolSize, DexIO.Logger logger)
throws IOException { throws IOException {
writeCommonSingleThread(multiDex, directory, nameIterator, null, null, dexFile, minMainDexClassCount,
minimalMainDex, maxDexPoolSize, logger);
}
private static void writeCommonSingleThread(boolean multiDex, File base, DexFileNameIterator nameIterator,
String currentName, File currentFile, DexFile dexFile, int minMainDexClassCount, boolean minimalMainDex,
int maxDexPoolSize, DexIO.Logger logger) throws IOException {
Set<? extends ClassDef> classes = dexFile.getClasses(); Set<? extends ClassDef> classes = dexFile.getClasses();
if (!multiDex) { if (!multiDex) {
minMainDexClassCount = classes.size(); minMainDexClassCount = classes.size();
@ -80,7 +73,7 @@ public class DexIO {
} }
Object lock = new Object(); Object lock = new Object();
synchronized (lock) { // avoid multiple synchronizations in single-threaded mode synchronized (lock) { // avoid multiple synchronizations in single-threaded mode
writeCommon(base, nameIterator, currentName, currentFile, Iterators.peekingIterator(classes.iterator()), writeCommon(directory, nameIterator, null, null, Iterators.peekingIterator(classes.iterator()),
minMainDexClassCount, minimalMainDex, dexFile.getOpcodes(), maxDexPoolSize, logger, lock); minMainDexClassCount, minimalMainDex, dexFile.getOpcodes(), maxDexPoolSize, logger, lock);
} }
} }