Implement and delegate ListeningExecutorService api to clean up the try-with-resources code segments

RELNOTES:None
PiperOrigin-RevId: 185536875

1 files changed, 4 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
index 155d7b39d7..3fe61a32df 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java
@@ -61,7 +61,8 @@ public class AndroidCompiledResourceMergingAction {
     Preconditions.checkNotNull(options.classJarOutput);
 
     try (ScopedTemporaryDirectory scopedTmp =
-        new ScopedTemporaryDirectory("android_resource_merge_tmp")) {
+            new ScopedTemporaryDirectory("android_resource_merge_tmp");
+        ExecutorServiceCloser executorService = ExecutorServiceCloser.createWithFixedPoolOf(15)) {
       Path tmp = scopedTmp.getPath();
       Path generatedSources = tmp.resolve("generated_resources");
       Path processedManifest = tmp.resolve("manifest-processed/AndroidManifest.xml");
@@ -86,7 +87,8 @@ public class AndroidCompiledResourceMergingAction {
           options.directData,
           options.transitiveData,
           resourceClassWriter,
-          options.throwOnResourceConflict);
+          options.throwOnResourceConflict,
+          executorService);
       logger.fine(String.format("Merging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
 
       AndroidResourceOutputs.createClassJar(generatedSources, options.classJarOutput);