Skip to content

Commit

Permalink
Remove duplicate ManifestProcessingException
Browse files Browse the repository at this point in the history
`ManifestProcessingException` was duplicated somehow and can be removed to avoid confusion.

More context: bazelbuild#14427 (comment)

Closes bazelbuild#14613.

PiperOrigin-RevId: 427074145
  • Loading branch information
Bencodes authored and copybara-github committed Feb 8, 2022
1 parent 6fc1e22 commit 6282ffe
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ public Path getManifest() {

public DensityFilteredAndroidData filter(
DensitySpecificResourceFilter resourceFilter,
DensitySpecificManifestProcessor manifestProcessor)
throws ManifestProcessingException {
DensitySpecificManifestProcessor manifestProcessor) {
return new DensityFilteredAndroidData(
resourceFilter.filter(resourceDir), assetDir, manifestProcessor.process(manifest));
}
Expand Down

0 comments on commit 6282ffe

Please sign in to comment.