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/ValidateAndLinkResourcesAction.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/ValidateAndLinkResourcesAction.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ValidateAndLinkResourcesAction.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ValidateAndLinkResourcesAction.java b/src/tools/android/java/com/google/devtools/build/android/ValidateAndLinkResourcesAction.java index 5af2c67a59..cd8befc7b8 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ValidateAndLinkResourcesAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/ValidateAndLinkResourcesAction.java @@ -167,7 +167,8 @@ public class ValidateAndLinkResourcesAction { final Profiler profiler = LoggingProfiler.createAndStart("manifest"); try (ScopedTemporaryDirectory scopedTmp = - new ScopedTemporaryDirectory("android_resources_tmp")) { + new ScopedTemporaryDirectory("android_resources_tmp"); + ExecutorServiceCloser executorService = ExecutorServiceCloser.createWithFixedPoolOf(15)) { CompiledResources resources = // TODO(b/64570523): Remove when the flags are standardized. Optional.ofNullable(options.resources) @@ -184,7 +185,7 @@ public class ValidateAndLinkResourcesAction { scopedTmp.getPath().resolve("manifest-aapt-dummy/AndroidManifest.xml"), options.packageForR)); profiler.recordEndOf("manifest").startTask("link"); - ResourceLinker.create(aapt2Options.aapt2, scopedTmp.getPath()) + ResourceLinker.create(aapt2Options.aapt2, executorService, scopedTmp.getPath()) .profileUsing(profiler) .dependencies(Optional.ofNullable(options.deprecatedLibraries).orElse(options.libraries)) .include( |