diff options
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java | 17 |
1 files changed, 12 insertions, 5 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 8107f11304..c29142a748 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 @@ -292,7 +292,14 @@ public class AndroidResourceProcessingAction { 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 = Files.createTempDirectory("generated_resources"); + generatedSources.toFile().deleteOnExit(); + } + LOGGER.fine(String.format("Setup finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); final ImmutableList<DirectoryModifier> modifiers = ImmutableList.of( @@ -332,18 +339,18 @@ public class AndroidResourceProcessingAction { filteredData, options.data, working.resolve("manifest"), - options.generatedSourcePath, + generatedSources, options.packagePath, options.proguardOutput); LOGGER.fine(String.format("appt finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); if (options.srcJarOutput != null) { - resourceProcessor.createSrcJar(options.generatedSourcePath, options.srcJarOutput); + resourceProcessor.createSrcJar(generatedSources, options.srcJarOutput); } if (options.rOutput != null) { - resourceProcessor.copyRToOutput(options.generatedSourcePath, options.rOutput); + resourceProcessor.copyRToOutput(generatedSources, options.rOutput); } if (options.symbolsTxtOut != null) { - resourceProcessor.copyRToOutput(options.generatedSourcePath, options.symbolsTxtOut); + resourceProcessor.copyRToOutput(generatedSources, options.symbolsTxtOut); } LOGGER.fine(String.format("Packaging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); |