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/AndroidDataWriter.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/AndroidDataWriter.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java index 22a3bc7f25..2e2f85e286 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java @@ -17,7 +17,6 @@ import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.ide.common.internal.PngCruncher; import com.android.ide.common.internal.PngException; -import com.android.ide.common.res2.MergingException; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; @@ -28,6 +27,7 @@ import com.google.common.collect.Ordering; 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.AndroidResourceMergingAction.Options; import com.google.devtools.build.android.xml.Namespaces; import java.io.BufferedWriter; @@ -74,7 +74,7 @@ public class AndroidDataWriter implements AndroidDataWritingVisitor { Files.createDirectories(destinationPath.getParent()); cruncher.crunchPng(0, source.toFile(), destinationPath.toFile()); } catch (PngException e) { - throw MergingException.wrapException(e).build(); + throw MergingException.wrapException(e); } return Boolean.TRUE; } |