diff options
| author |  ajmichael <ajmichael@google.com> | 2017-05-05 04:03:37 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-05-05 15:26:29 +0200 |
| commit | f2528c1b96751692aae233aa839f86d0f887b75f (patch) | |
| tree | d59c014fe33e4314903c400f3912726bbbb74ac7 /src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java | |
| parent | 06dd9143d45364b1e5fb33eb4de9132e57ce25b1 (diff) | |
Remove some more usages of res2.MergingException and open source some tests.
Since https://github.com/bazelbuild/bazel/issues/2709 was fixed, this CL also enables ParsedAndroidDataTest.
RELNOTES: None
PiperOrigin-RevId: 155155095
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java index eb9ffa3cd9..7ed92d7f5e 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java @@ -19,10 +19,10 @@ import com.android.ide.common.internal.LoggedErrorException; import com.android.ide.common.internal.PngCruncher; import com.android.ide.common.process.DefaultProcessExecutor; import com.android.ide.common.process.LoggedProcessOutputHandler; -import com.android.ide.common.res2.MergingException; import com.android.utils.StdLogger; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableSet; +import com.google.devtools.build.android.AndroidResourceMerger.MergingException; import com.google.devtools.build.android.AndroidResourceProcessor.AaptConfigOptions; import com.google.devtools.build.android.AndroidResourceProcessor.FlagAaptOptions; import com.google.devtools.build.android.Converters.DependencyAndroidDataListConverter; |