diff options
| author |  corysmith <corysmith@google.com> | 2017-05-04 19:47:56 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-05-04 23:06:01 +0200 |
| commit | 54c3cbefcc0b6f5a6fb50b48fe2da915122238d6 (patch) | |
| tree | 0eebe60a7ece0dc1dda8efcddb988dc563def558 /src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java | |
| parent | b71e99b1f3746103e5d6802eebc24096b3494959 (diff) | |
Remove MergingException
Fixes https://github.com/bazelbuild/bazel/issues/2709
RELNOTES: None.
PiperOrigin-RevId: 155097576
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java index 208c0707bc..235e0c2fc5 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java +++ b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java @@ -14,7 +14,6 @@ package com.google.devtools.build.android; import com.android.SdkConstants; -import com.android.ide.common.res2.MergingException; import com.android.resources.FolderTypeRelationship; import com.android.resources.ResourceFolderType; import com.google.common.annotations.VisibleForTesting; @@ -25,6 +24,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.collect.Sets.SetView; +import com.google.devtools.build.android.AndroidResourceMerger.MergingException; import com.google.devtools.build.android.xml.StyleableXmlResourceValue; import java.io.IOException; import java.nio.file.FileVisitOption; @@ -89,7 +89,7 @@ public class ParsedAndroidData { if (!errors.isEmpty()) { MergingException mergingException = MergingException - .withMessage(String.format("%s Parse Error(s)", errors.size())).build(); + .withMessage(String.format("%s Parse Error(s)", errors.size())); for (Exception e : errors) { mergingException.addSuppressed(e); } |