summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Morey <jmorey@google.com>2017-01-13 17:44:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-13 17:44:38 +0000
commitd288c446540a1d09e3315025207200ee591c7563 (patch)
treedec1f2fcd8ba821263a4b0179fb0b4318c707a28
parentb703c32e27a3995732387e06fab24ffda7d64ff8 (diff)
parentb504c8f1b2edc203dca3959d29bc0dcf9e6fc8dd (diff)
downloadmultidex-d288c446540a1d09e3315025207200ee591c7563.tar.gz
Merge "Prefix temp files to ensure they are cleaned up"
am: b504c8f1b2 Change-Id: I97e7c14ab15cf0af6e61410ea26164447300297b
-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 {