Remove duplicate ManifestProcessingException

bazelbuild · Jan 21, 2022 · 9ea5d09 · 9ea5d09
1 parent fb744c8
commit 9ea5d09
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 33 deletions.
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidManifest.java b/src/tools/android/java/com/google/devtools/build/android/AndroidManifest.java
@@ -82,7 +82,7 @@ public static AndroidManifest parseFrom(Path manifest) {
 
  return new AndroidManifest(packageName, minSdk.isEmpty() ? "1" : minSdk);
  } catch (IOException | XMLStreamException e) {
- throw new ManifestProcessingException(e);
+ throw new AndroidManifestProcessor.ManifestProcessingException(e);
  }
  }
 

diff --git a/...ools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java b/...ools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java
@@ -105,7 +105,8 @@ public DensitySpecificManifestProcessor(List<String> densities, Path out) {
  * specified densities. If the manifest already contains a superset of the
  * &lt;compatible-screens&gt; section to be created, it is left unchanged.
  *
- * @throws ManifestProcessingException when the manifest cannot be properly modified.
+ * @throws AndroidManifestProcessor.ManifestProcessingException when the manifest cannot be
+ * properly modified.
  */
  public Path process(Path manifest) {
  if (densities.isEmpty()) {

diff --git a/src/tools/android/java/com/google/devtools/build/android/ManifestProcessingException.java b/src/tools/android/java/com/google/devtools/build/android/ManifestProcessingException.java
diff --git a/src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/MergedAndroidData.java
@@ -53,7 +53,7 @@ public Path getManifest() {
  public DensityFilteredAndroidData filter(
  DensitySpecificResourceFilter resourceFilter,
  DensitySpecificManifestProcessor manifestProcessor)
- throws ManifestProcessingException {
+ throws AndroidManifestProcessor.ManifestProcessingException {
  return new DensityFilteredAndroidData(
  resourceFilter.filter(resourceDir), assetDir, manifestProcessor.process(manifest));
  }