diff options
| author |  corysmith <corysmith@google.com> | 2018-03-06 20:08:56 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-06 20:10:55 -0800 |
| commit | 59455a58d5203401af785f6229c3d30c94b57fec (patch) | |
| tree | 32336ca0a8ba783599ecb022115a316b9ad69df8 /src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java | |
| parent | 67627d3034de3b66431abfb0d178a0c27408a30b (diff) | |
Filter out non-.flat files while linking.
RELNOTES: None
PiperOrigin-RevId: 188121571
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java b/src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java index 3c9151748a..ea0306ba40 100644 --- a/src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/CompileLibraryResourcesAction.java @@ -16,7 +16,6 @@ package com.google.devtools.build.android; import com.android.repository.Revision; import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.ListeningExecutorService; import com.google.devtools.build.android.Converters.ExistingPathConverter; import com.google.devtools.build.android.Converters.PathConverter; import com.google.devtools.build.android.Converters.RevisionConverter; @@ -28,7 +27,6 @@ import com.google.devtools.common.options.OptionEffectTag; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.ShellQuotedParamsFilePreProcessor; -import java.io.Closeable; import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; @@ -136,8 +134,7 @@ public class CompileLibraryResourcesAction { Preconditions.checkNotNull(options.output); Preconditions.checkNotNull(options.aapt2); - final ListeningExecutorService defaultService = ExecutorServiceCloser.createDefaultService(); - try (Closeable serviceCloser = ExecutorServiceCloser.createWith(defaultService); + try (ExecutorServiceCloser executorService = ExecutorServiceCloser.createWithFixedPoolOf(15); ScopedTemporaryDirectory scopedTmp = new ScopedTemporaryDirectory("android_resources_tmp")) { final Path tmp = scopedTmp.getPath(); @@ -147,7 +144,7 @@ public class CompileLibraryResourcesAction { final ResourceCompiler compiler = ResourceCompiler.create( - defaultService, compiledResources, options.aapt2, options.buildToolsVersion); + executorService, compiledResources, options.aapt2, options.buildToolsVersion); options .resources .toData(options.manifest) |