Internal change

PiperOrigin-RevId: 196113268

4 files changed, 32 insertions, 131 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java
index 8c24031209..8cc58853c2 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java
@@ -302,7 +302,7 @@ public class AndroidCompiledDataDeserializer implements AndroidDataDeserializer
               String source = sourcePool.get(sourceIndex);
               DataSource dataSource = DataSource.of(Paths.get(source));
 
-              Value resourceValue = configValue.getValue();
+              Value resourceValue = resource.getConfigValue(0).getValue();
 
               DataResource dataResource =
                   resourceValue.getItem().hasFile()
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java
index cc19be8f0c..41d942736f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceOutputs.java
@@ -18,9 +18,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
 import com.google.common.collect.Ordering;
-import com.google.devtools.build.android.aapt2.ResourceCompiler;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -89,12 +87,6 @@ public class AndroidResourceOutputs {
     }
 
     protected void addEntry(String rawName, byte[] content, int storageMethod) throws IOException {
-      addEntry(rawName, content, storageMethod, null);
-    }
-
-    protected void addEntry(
-        String rawName, byte[] content, int storageMethod, @Nullable String comment)
-        throws IOException {
       // Fix the path for windows.
       String relativeName = rawName.replace('\\', '/');
       // Make sure the zip entry is not absolute.
@@ -107,9 +99,6 @@ public class AndroidResourceOutputs {
       CRC32 crc32 = new CRC32();
       crc32.update(content);
       entry.setCrc(crc32.getValue());
-      if (!Strings.isNullOrEmpty(comment)) {
-        entry.setComment(comment);
-      }
 
       zip.putNextEntry(entry);
       zip.write(content);
@@ -117,8 +106,8 @@ public class AndroidResourceOutputs {
     }
 
     protected void addEntry(ZipEntry entry, byte[] content) throws IOException {
-      // Create a new ZipEntry because there are occasional discrepancies
-      // between the metadata and written content.
+      //Create a new ZipEntry because there are occasional discrepancies
+      //between the metadata and written content.
       ZipEntry newEntry = new ZipEntry(entry.getName());
       zip.putNextEntry(newEntry);
       zip.write(content);
@@ -423,7 +412,6 @@ public class AndroidResourceOutputs {
     try (ZipBuilder builder = ZipBuilder.createFor(archiveOut)) {
       for (Path artifact : compiledArtifacts) {
         Path relativeName = artifact;
-
         // remove compiled resources prefix
         if (artifact.startsWith(compiledRoot)) {
           relativeName = compiledRoot.relativize(relativeName);
@@ -436,11 +424,7 @@ public class AndroidResourceOutputs {
                   relativeName.getNameCount());
         }
 
-        builder.addEntry(
-            relativeName.toString(),
-            Files.readAllBytes(artifact),
-            ZipEntry.STORED,
-            ResourceCompiler.getCompiledType(relativeName.toString()).asComment());
+        builder.addEntry(relativeName.toString(), Files.readAllBytes(artifact), ZipEntry.STORED);
       }
     }
     return archiveOut;
diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
index 57cbcb533b..68e12e146e 100644
--- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
+++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java
@@ -40,7 +40,6 @@ import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -61,43 +60,6 @@ import javax.xml.stream.events.XMLEvent;
 
 /** Invokes aapt2 to compile resources. */
 public class ResourceCompiler {
-
-  /** Types of compiled resources. */
-  public enum CompiledType {
-    NORMAL(null),
-    GENERATED("generated"),
-    DEFAULT("default");
-
-    private final String prefix;
-
-    CompiledType(String prefix) {
-      this.prefix = prefix;
-    }
-
-    boolean prefixes(String filename) {
-      return prefix != null && filename.startsWith(prefix);
-    }
-
-    public String asPrefix() {
-      return prefix;
-    }
-
-    public String asComment() {
-      return prefix;
-    }
-
-    public String prefix(String path) {
-      return prefix + "/" + path;
-    }
-  }
-
-  public static CompiledType getCompiledType(String fileName) {
-    return Arrays.stream(CompiledType.values())
-        .filter(t -> t.prefixes(fileName))
-        .findFirst()
-        .orElse(CompiledType.NORMAL);
-  }
-
   static class CompileError extends Aapt2Exception {
 
     protected CompileError(Throwable e) {
@@ -143,28 +105,19 @@ public class ResourceCompiler {
     @Override
     public List<Path> call() throws Exception {
       final String directoryName = file.getParent().getFileName().toString();
-      final Qualifiers qualifiers = Qualifiers.parseFrom(directoryName);
-      final String filename = interpolateAapt2Filename(qualifiers, file.getFileName().toString());
+      Qualifiers qualifiers = Qualifiers.parseFrom(directoryName);
+      String filename = interpolateAapt2Filename(qualifiers, file.getFileName().toString());
 
-      final List<Path> results = new ArrayList<>();
+      List<Path> results = new ArrayList<>();
+      compile(directoryName, filename, results, compiledResourcesOut, file, false);
       if (qualifiers.asFolderType().equals(ResourceFolderType.VALUES)) {
         extractAttributes(directoryName, filename, results);
-      }
 
-      if (qualifiers.containDefaultLocale()
-          && qualifiers.asFolderType().equals(ResourceFolderType.VALUES)) {
-        compile(
-            directoryName,
-            filename,
-            results,
-            compiledResourcesOut.resolve(CompiledType.DEFAULT.asPrefix()),
-            file,
-            false);
-        // aapt2 only generates pseudo locales for the default locale.
-        generatedResourcesOut.ifPresent(
-            out -> compile(directoryName, filename, results, out, file, true));
-      } else {
-        compile(directoryName, filename, results, compiledResourcesOut, file, false);
+        if (qualifiers.containDefaultLocale()) {
+          // aapt2 only generates pseudo locales for the default locale.
+          generatedResourcesOut.ifPresent(
+              out -> compile(directoryName, filename, results, out, file, true));
+        }
       }
       return results;
     }
@@ -409,33 +362,17 @@ public class ResourceCompiler {
                     generatedResourcesOut)));
       }
 
-      ImmutableList.Builder<Path> compiled = ImmutableList.builder();
-      ImmutableList.Builder<Path> generated = ImmutableList.builder();
+      ImmutableList.Builder<Path> builder = ImmutableList.builder();
       List<Throwable> compilationErrors = new ArrayList<>();
       for (ListenableFuture<List<Path>> task : tasks) {
         try {
-          // Split the generated and non-generated resources into different collections.
-          // This allows the generated files to be placed first in the compile order,
-          // ensuring that the generated locale (en-XA and ar-XB) can be overwritten by
-          // user provided versions for those locales, as aapt2 will take the last value for
-          // a configuration when linking.
-          task.get()
-              .forEach(
-                  path -> {
-                    if (generatedResourcesOut.map(path::startsWith).orElse(false)) {
-                      generated.add(path);
-                    } else {
-                      compiled.add(path);
-                    }
-                  });
+          builder.addAll(task.get());
         } catch (InterruptedException | ExecutionException e) {
-          compilationErrors.add(e.getCause() != null ? e.getCause() : e);
+          compilationErrors.add(Optional.ofNullable(e.getCause()).orElse(e));
         }
       }
-      generated.addAll(compiled.build());
       if (compilationErrors.isEmpty()) {
-        // ensure that the generated files are before the normal files.
-        return generated.build();
+        return builder.build();
       }
       throw CompileError.of(compilationErrors);
     }
@@ -456,7 +393,7 @@ public class ResourceCompiler {
             aapt2,
             buildToolsVersion,
             generatePseudoLocale
-                ? Optional.of(compiledResources.resolve(CompiledType.GENERATED.asPrefix()))
+                ? Optional.of(compiledResources.resolve("generated"))
                 : Optional.empty()));
   }
 
diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java
index 1ca2b53eff..c5c3236043 100644
--- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java
+++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java
@@ -20,16 +20,12 @@ import com.android.repository.Revision;
 import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Streams;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.devtools.build.android.AaptCommandBuilder;
 import com.google.devtools.build.android.AndroidResourceOutputs;
 import com.google.devtools.build.android.Profiler;
-import com.google.devtools.build.android.aapt2.ResourceCompiler.CompiledType;
-import com.google.devtools.build.android.ziputils.DirectoryEntry;
 import com.google.devtools.build.android.ziputils.ZipIn;
 import com.google.devtools.build.android.ziputils.ZipOut;
 import java.io.IOException;
@@ -53,24 +49,7 @@ import java.util.stream.Stream;
 /** Performs linking of {@link CompiledResources} using aapt2. */
 public class ResourceLinker {
 
-  private static final Predicate<String> IS_JAR = s -> s.endsWith(".jar");
   private boolean debug;
-  private static final Predicate<DirectoryEntry> IS_FLAT_FILE =
-      h -> h.getFilename().endsWith(".flat");
-
-  private static final Predicate<DirectoryEntry> COMMENT_ABSENT =
-      h -> Strings.isNullOrEmpty(h.getComment());
-
-  private static final Predicate<DirectoryEntry> USE_GENERATED =
-      COMMENT_ABSENT.or(
-          h -> ResourceCompiler.getCompiledType(h.getFilename()) == CompiledType.GENERATED);
-
-  private static final Predicate<DirectoryEntry> USE_DEFAULT =
-      COMMENT_ABSENT.or(
-          h -> ResourceCompiler.getCompiledType(h.getComment()) != CompiledType.GENERATED);
-
-  private static final ImmutableSet<String> PSEUDO_LOCALE_FILTERS =
-      ImmutableSet.of("en_XA", "ar_XB");
 
   /** Represents errors thrown during linking. */
   public static class LinkError extends Aapt2Exception {
@@ -205,7 +184,9 @@ public class ResourceLinker {
               .when(outputAsProto)
               .thenAdd("--proto-format")
               .addParameterableRepeated(
-                  "-R", compiledResourcesToPaths(compiled, IS_FLAT_FILE), workingDirectory)
+                  "-R",
+                  compiledResourcesToPaths(compiled, s -> s.endsWith(".flat")),
+                  workingDirectory)
               .addRepeated("-I", pathsToLinkAgainst)
               .add("--auto-add-overlay")
               .add("-o", outPath)
@@ -230,11 +211,14 @@ public class ResourceLinker {
                 .when(outputAsProto)
                 .thenAdd("--proto-format")
                 // only link against jars
-                .addRepeated("-I", pathsToLinkAgainst.stream().filter(IS_JAR).collect(toList()))
+                .addRepeated(
+                    "-I",
+                    pathsToLinkAgainst.stream().filter(s -> s.endsWith(".jar")).collect(toList()))
                 .add("-R", outPath)
                 // only include non-jars
                 .addRepeated(
-                    "-R", pathsToLinkAgainst.stream().filter(IS_JAR.negate()).collect(toList()))
+                    "-R",
+                    pathsToLinkAgainst.stream().filter(s -> !s.endsWith(".jar")).collect(toList()))
                 .add("--auto-add-overlay")
                 .add("-o", outPath.resolveSibling("transitive.apk"))
                 .add("--java", javaSourceDirectory)
@@ -253,7 +237,7 @@ public class ResourceLinker {
   }
 
   private List<String> compiledResourcesToPaths(
-      CompiledResources compiled, Predicate<DirectoryEntry> shouldKeep) throws IOException {
+      CompiledResources compiled, Predicate<String> shouldKeep) throws IOException {
     // Using sequential streams to maintain the overlay order for aapt2.
     return Stream.concat(include.stream(), Stream.of(compiled))
         .sequential()
@@ -265,7 +249,7 @@ public class ResourceLinker {
         .collect(toList());
   }
 
-  private Path filterZip(Path path, Predicate<DirectoryEntry> shouldKeep) throws IOException {
+  private Path filterZip(Path path, Predicate<String> shouldKeep) throws IOException {
     Path outPath =
         workingDirectory
             .resolve("filtered")
@@ -283,7 +267,7 @@ public class ResourceLinker {
       final ZipOut zipOut = new ZipOut(outChannel, outPath.toString());
       zipIn.scanEntries(
           (in, header, dirEntry, data) -> {
-            if (shouldKeep.test(dirEntry)) {
+            if (shouldKeep.test(header.getFilename())) {
               zipOut.nextEntry(dirEntry);
               zipOut.write(header);
               zipOut.write(data);
@@ -323,7 +307,7 @@ public class ResourceLinker {
       Path resourceIds = workingDirectory.resolve("ids.txt");
 
       profiler.startTask("fulllink");
-      logger.fine(
+      logger.finer(
           new AaptCommandBuilder(aapt2)
               .forBuildToolsVersion(buildToolsVersion)
               .forVariantType(VariantType.DEFAULT)
@@ -354,11 +338,7 @@ public class ResourceLinker {
               .addRepeated("-I", StaticLibrary.toPathStrings(linkAgainst))
               .addParameterableRepeated(
                   "-R",
-                  compiledResourcesToPaths(
-                      compiled,
-                      resourceConfigs.stream().anyMatch(PSEUDO_LOCALE_FILTERS::contains)
-                          ? IS_FLAT_FILE.and(USE_GENERATED)
-                          : IS_FLAT_FILE.and(USE_DEFAULT)),
+                  compiledResourcesToPaths(compiled, s -> s.endsWith(".flat")),
                   workingDirectory)
               // Never compress apks.
               .add("-0", "apk")
@@ -383,7 +363,7 @@ public class ResourceLinker {
             outPath, rTxt, proguardConfig, mainDexProguard, javaSourceDirectory, resourceIds);
       }
       final Path optimized = workingDirectory.resolve("optimized.apk");
-      logger.fine(
+      logger.finer(
           new AaptCommandBuilder(aapt2)
               .forBuildToolsVersion(buildToolsVersion)
               .forVariantType(VariantType.DEFAULT)