Remove MergingException

Fixes https://github.com/bazelbuild/bazel/issues/2709

RELNOTES: None.
PiperOrigin-RevId: 155097576

1 files changed, 4 insertions, 4 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
index 90b9c74fd1..b9a372d32c 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.android;
 
-import com.android.ide.common.res2.MergingException;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
@@ -21,6 +20,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import com.google.devtools.build.android.AndroidResourceMerger.MergingException;
 import com.google.devtools.build.android.ParsedAndroidData.Builder;
 import com.google.devtools.build.android.ParsedAndroidData.ParsedAndroidDataBuildingPathWalker;
 import java.io.IOException;
@@ -60,7 +60,7 @@ class AndroidDataMerger {
         dependency.deserialize(deserializer, parsedDataBuilder.consumers());
       } catch (DeserializationException e) {
         if (!e.isLegacy()) {
-          throw MergingException.wrapException(e).build();
+          throw MergingException.wrapException(e);
         }
         logger.fine(
             String.format(
@@ -290,7 +290,7 @@ class AndroidDataMerger {
       return doMerge(
           transitive, direct, parsedPrimary, primaryData.getManifest(), allowPrimaryOverrideAll);
     } catch (IOException e) {
-      throw MergingException.wrapException(e).build();
+      throw MergingException.wrapException(e);
     }
   }
 
@@ -431,7 +431,7 @@ class AndroidDataMerger {
       return UnwrittenMergedAndroidData.of(
           primaryManifest, primaryBuilder.build(), transitiveBuilder.build());
     } catch (IOException e) {
-      throw MergingException.wrapException(e).build();
+      throw MergingException.wrapException(e);
     }
   }
 }