summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Morey <jmorey@google.com>2017-01-13 17:53:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-13 17:53:40 +0000
commit0b80313260ba74c583918dd26d3b5130524dd9bc (patch)
treedec1f2fcd8ba821263a4b0179fb0b4318c707a28
parent7bf8f6f48f2e2a116716e18c6c30ad700c891b19 (diff)
parentd288c446540a1d09e3315025207200ee591c7563 (diff)
downloadmultidex-0b80313260ba74c583918dd26d3b5130524dd9bc.tar.gz
Merge "Prefix temp files to ensure they are cleaned up" am: b504c8f1b2
am: d288c44654 Change-Id: If625dc1bae06d2f8fc0e8203c984df1db2f537e7
-rw-r--r--library/src/android/support/multidex/MultiDexExtractor.java3
1 files changed, 2 insertions, 1 deletions
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 @@ final class MultiDexExtractor {
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 {