Fix parsing for some aapt2-generated resources.

RELNOTES: none
PiperOrigin-RevId: 181506851

1 files changed, 24 insertions, 7 deletions

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 50c5ff5b13..75ac26a993 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
@@ -215,17 +215,34 @@ public class ResourceCompiler {
     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
       // Ignore directories and "hidden" files that start with .
       if (!Files.isDirectory(file) && !file.getFileName().toString().startsWith(".")) {
+        // Creates a relative output path based on the input path under the
+        // compiledResources path.
+        Path outputDirectory = Files.createDirectories(
+            compiledResources.resolve(
+                (file.isAbsolute() ? file.getRoot().relativize(file) : file)
+                    .getParent()
+                    .getParent()));
+
+        String resFolder = file.getParent().getFileName().toString().toLowerCase();
+
+        // Aapt cannot interpret these regions so we rename them to get them to compile
+        String renamedResFolder = resFolder
+            .replaceFirst("sr[_\\-]r?latn", "b+sr+Latn")
+            .replaceFirst("es[_\\-]419", "b+es+419");
+
+        if (!renamedResFolder.equals(resFolder)) {
+          file = Files.copy(
+              file,
+              Files.createDirectory(
+                  outputDirectory.resolve(renamedResFolder))
+                  .resolve(file.getFileName()));
+        }
+
         tasks.add(
             executorService.submit(
                 new CompileTask(
                     file,
-                    // Creates a relative output path based on the input path under the
-                    // compiledResources path.
-                    Files.createDirectories(
-                        compiledResources.resolve(
-                            (file.isAbsolute() ? file.getRoot().relativize(file) : file)
-                                .getParent()
-                                .getParent())),
+                    outputDirectory,
                     aapt2,
                     buildToolsVersion)));
       }