commit 708a59cce460844b0eb812486a6e9e2a540cfb3f
author Justin Morey <jmorey@google.com> Fri Jan 13 18:05:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 13 18:05:32 2017 +0000
tree dec1f2fcd8ba821263a4b0179fb0b4318c707a28
parent 5504711f87fb13b1388739eda3397526906110a5
parent 0b80313260ba74c583918dd26d3b5130524dd9bc

Merge "Prefix temp files to ensure they are cleaned up" am: b504c8f1b2 am: d288c44654
am: 0b80313260

Change-Id: I0d5772c4ce26e9f1b3c7b8d517ed962345cfcf02

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 32d7ee9..177279a 100644
--- a/library/src/android/support/multidex/MultiDexExtractor.java
+++ b/library/src/android/support/multidex/MultiDexExtractor.java
@@ -334,7 +334,8 @@
 
         InputStream in = apk.getInputStream(dexFile);
         ZipOutputStream out = null;
-        File tmp = File.createTempFile(extractedFilePrefix, EXTRACTED_SUFFIX,
+        // Temp files must not start with extractedFilePrefix to get cleaned up in prepareDexDir()
+        File tmp = File.createTempFile("tmp-" + extractedFilePrefix, EXTRACTED_SUFFIX,
                 extractTo.getParentFile());
         Log.i(TAG, "Extracting " + tmp.getPath());
         try {