Adds compile action for aapt2: Aapt2ResourcePackagingAction

Adds a ManifestContainer interface to centralize the types that provide manifests.
Adds PackagedResources to represent a linked dexless resource apk

RELNOTES: None
PiperOrigin-RevId: 166193049

1 files changed, 3 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/android/DensitySpecificManifestProcessorTest.java b/src/test/java/com/google/devtools/build/android/DensitySpecificManifestProcessorTest.java
index 1a940410d4..e43cc9f8c9 100644
--- a/src/test/java/com/google/devtools/build/android/DensitySpecificManifestProcessorTest.java
+++ b/src/test/java/com/google/devtools/build/android/DensitySpecificManifestProcessorTest.java
@@ -155,7 +155,7 @@ public class DensitySpecificManifestProcessorTest {
       new DensitySpecificManifestProcessor(ImmutableList.of("xhdpi"),
           tmp.resolve("manifest-filtered/AndroidManifest.xml")).process(manifest);
       fail();
-    } catch (ManifestProcessingException e) {
+    } catch (AndroidManifestProcessor.ManifestProcessingException e) {
       assertThat(e).hasMessageThat().contains("must be well-formed");
     }
   }
@@ -166,7 +166,7 @@ public class DensitySpecificManifestProcessorTest {
       new DensitySpecificManifestProcessor(ImmutableList.of("xhdpi"),
           tmp.resolve("manifest-filtered/AndroidManifest.xml")).process(manifest);
       fail();
-    } catch (ManifestProcessingException e) {
+    } catch (AndroidManifestProcessor.ManifestProcessingException e) {
       assertThat(e).hasMessageThat().contains("Premature end of file.");
     }
   }
@@ -183,7 +183,7 @@ public class DensitySpecificManifestProcessorTest {
       new DensitySpecificManifestProcessor(ImmutableList.of("xhdpi"),
           tmp.resolve("manifest-filtered/AndroidManifest.xml")).process(manifest);
       fail();
-    } catch (ManifestProcessingException e) {
+    } catch (AndroidManifestProcessor.ManifestProcessingException e) {
       assertThat(e).hasMessageThat().contains("does not contain exactly one <manifest>");
     }
   }