aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-02-08 18:16:15 +0000
committerGravatar Dmitry Lomov <dslomov@google.com>2016-02-09 12:19:17 +0000
commit40561f0bc889be8c0d90445befe75878ddee717b (patch)
tree6620c7f6818724e36dce861921365afc81338db0 /src
parentdad16c40001c6007b2679a2fd9c63235b04d26ec (diff)
*** Reason for rollback *** Breaks density filtering. *** Original change description *** Collect all the temporary directories into one tree that will delete on exit. -- MOS_MIGRATED_REVID=114122848
Diffstat (limited to 'src')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
index 646b8389ee..31bbdbfae5 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
@@ -283,21 +283,24 @@ public class AndroidResourceProcessingAction {
options = optionsParser.getOptions(Options.class);
FileSystem fileSystem = FileSystems.getDefault();
Path working = fileSystem.getPath("").toAbsolutePath();
+ Path mergedAssets = working.resolve("merged_assets");
+ Path mergedResources = working.resolve("merged_resources");
+
final AndroidResourceProcessor resourceProcessor =
new AndroidResourceProcessor(STD_LOGGER);
try {
- final Path tmp = Files.createTempDirectory("android_resources_tmp");
- tmp.toFile().deleteOnExit();
- final Path expandedOut = tmp.resolve("tmp-expanded");
- final Path deduplicatedOut = tmp.resolve("tmp-deduplicated");
- final Path mergedAssets = tmp.resolve("merged_assets");
- final Path mergedResources = tmp.resolve("merged_resources");
+
+ Path expandedOut = Files.createTempDirectory("tmp-expanded");
+ expandedOut.toFile().deleteOnExit();
+ Path deduplicatedOut = Files.createTempDirectory("tmp-deduplicated");
+ deduplicatedOut.toFile().deleteOnExit();
Path generatedSources = null;
if (options.srcJarOutput != null || options.rOutput != null
|| options.symbolsTxtOut != null) {
- generatedSources = tmp.resolve("generated_resources");
+ generatedSources = Files.createTempDirectory("generated_resources");
+ generatedSources.toFile().deleteOnExit();
}
LOGGER.fine(String.format("Setup finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
@@ -347,7 +350,7 @@ public class AndroidResourceProcessingAction {
options.versionName,
filteredData,
data,
- tmp.resolve("processed_manifest"),
+ working.resolve("manifest"),
generatedSources,
options.packagePath,
options.proguardOutput,