From ba40d1957585a2e2355e79fe84fcbab8703d900e Mon Sep 17 00:00:00 2001 From: Lanchon Date: Sun, 24 Sep 2017 00:21:08 -0300 Subject: [PATCH] Remove writeCommonSingleThread --- src/main/java/lanchon/multidexlib2/DexIO.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/lanchon/multidexlib2/DexIO.java b/src/main/java/lanchon/multidexlib2/DexIO.java index 8b19502..de212c1 100644 --- a/src/main/java/lanchon/multidexlib2/DexIO.java +++ b/src/main/java/lanchon/multidexlib2/DexIO.java @@ -66,13 +66,6 @@ public class DexIO { static void writeMultiDexDirectorySingleThread(boolean multiDex, File directory, DexFileNameIterator nameIterator, DexFile dexFile, int minMainDexClassCount, boolean minimalMainDex, int maxDexPoolSize, DexIO.Logger logger) 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 classes = dexFile.getClasses(); if (!multiDex) { minMainDexClassCount = classes.size(); @@ -80,7 +73,7 @@ public class DexIO { } Object lock = new Object(); 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); } }