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/AndroidResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
index ceda631537..c67806088f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java
@@ -209,7 +209,8 @@ public class AndroidResourceMergingAction {
     Preconditions.checkNotNull(options.primaryManifest);
 
     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 mergedAssets = tmp.resolve("merged_assets");
       Path mergedResources = tmp.resolve("merged_resources");
@@ -243,7 +244,8 @@ public class AndroidResourceMergingAction {
               packageType,
               options.symbolsBinOut,
               resourceClassWriter,
-              options.throwOnResourceConflict);
+              options.throwOnResourceConflict,
+              executorService);
 
       logger.fine(String.format("Merging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));