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, 4 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/Converters.java b/src/tools/android/java/com/google/devtools/build/android/Converters.java
index db88ade4d1..26d918b278 100644
--- a/src/tools/android/java/com/google/devtools/build/android/Converters.java
+++ b/src/tools/android/java/com/google/devtools/build/android/Converters.java
@@ -465,15 +465,15 @@ public final class Converters {
   /** Converts a list of static library strings into paths. */
   @Deprecated
   public static class StaticLibraryListConverter implements Converter<List<StaticLibrary>> {
-    static final Splitter SPLITTER = Splitter.on(File.pathSeparator);
+    static final Splitter SPLITTER = Splitter.on(File.pathSeparatorChar);
 
     static final StaticLibraryConverter libraryConverter = new StaticLibraryConverter();
 
     @Override
     public List<StaticLibrary> convert(String input) throws OptionsParsingException {
       final Builder<StaticLibrary> builder = ImmutableList.<StaticLibrary>builder();
-      for (String unused : SPLITTER.splitToList(input)) {
-        builder.add(libraryConverter.convert(input));
+      for (String path : SPLITTER.splitToList(input)) {
+        builder.add(libraryConverter.convert(path));
       }
       return builder.build();
     }
@@ -486,7 +486,6 @@ public final class Converters {
 
   /** Converts a static library string into path. */
   public static class StaticLibraryConverter implements Converter<StaticLibrary> {
-    static final Splitter SPLITTER = Splitter.on(File.pathSeparator);
 
     static final PathConverter pathConverter = new PathConverter(true);