commit b2483811cf6f4ef5a2999b05011bb0439070dcc5
author Yohann Roussel <yroussel@google.com> Wed Jan 17 14:50:03 2018 +0100
committer Yohann Roussel <yroussel@google.com> Thu Jan 18 18:10:28 2018 +0100
tree b3ef2bdb853f145d5249a28838482ebddfae5dd8
parent 0813385e7bc883ad6316879f24b07f1b35129d51

Use a rewriten makeDexElement on V 14 to 18

On those versions DexPathList.makeDexElement is hiding problems by
logging (or just ignoring) IOException instead of throwing them.

This change includes in the library a version of makeDexElement simplified
to support only the case concerning the zip files for the extracted
secondary dexes.

Bug: 71989458 28832787
Test: MultiDexLegacyTestServicesTests2
Change-Id: I7532908eda8fcd123433222856752c2086a9ad3a

library/src/android/support/multidex/MultiDexExtractor.java

diff --git a/library/src/android/support/multidex/MultiDexExtractor.java b/library/src/android/support/multidex/MultiDexExtractor.java
index ed3c125..f0fd6d4 100644
--- a/library/src/android/support/multidex/MultiDexExtractor.java
+++ b/library/src/android/support/multidex/MultiDexExtractor.java
@@ -63,10 +63,10 @@
      * {@code classes3.dex}, etc.
      */
     private static final String DEX_PREFIX = "classes";
-    private static final String DEX_SUFFIX = ".dex";
+    static final String DEX_SUFFIX = ".dex";
 
     private static final String EXTRACTED_NAME_EXT = ".classes";
-    private static final String EXTRACTED_SUFFIX = ".zip";
+    static final String EXTRACTED_SUFFIX = ".zip";
     private static final int MAX_EXTRACT_ATTEMPTS = 3;
 
     private static final String PREFS_FILE = "multidex.version";