diff options
Diffstat (limited to 'src/tools/android/java/com/google/devtools')
2 files changed, 4 insertions, 4 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; diff --git a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java index e279286871..70180c1ccd 100644 --- a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.java +++ b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificResourceFilter.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.Function; import com.google.common.base.Joiner; @@ -27,6 +26,7 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Ordering; +import com.google.devtools.build.android.AndroidResourceMerger.MergingException; import java.io.IOException; import java.nio.file.FileVisitOption; import java.nio.file.FileVisitResult; @@ -177,7 +177,7 @@ public class DensitySpecificResourceFilter { for (String density : densities) { if (!DENSITY_MAP.containsKey(density)) { - throw MergingException.withMessage(density + " is not a known density qualifier.").build(); + throw MergingException.withMessage(density + " is not a known density qualifier."); } } } @@ -309,7 +309,7 @@ public class DensitySpecificResourceFilter { /** Filters the contents of a resource directory. */ public Path filter(Path unFilteredResourceDir) { // no densities to filter, so skip. - if (densities.isEmpty()) { + if (densities.isEmpty()) { return unFilteredResourceDir; } final Path filteredResourceDir = |