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/AarGeneratorAction.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/AarGeneratorAction.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java index b3cea45fa7..3a047f3e6b 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java @@ -14,12 +14,12 @@ package com.google.devtools.build.android; import com.android.builder.core.VariantType; -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; import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; +import com.google.devtools.build.android.AndroidResourceMerger.MergingException; import com.google.devtools.build.android.Converters.ExistingPathConverter; import com.google.devtools.build.android.Converters.PathConverter; import com.google.devtools.build.android.Converters.UnvalidatedAndroidDataConverter; |