commit 9a249edc33a863815225a81b264d51b3666e16f8
author dchai <dchai@google.com> Fri Dec 13 16:43:02 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Dec 13 16:43:59 2019 -0800
tree acfe3047b95cfa0691d4d2b9fb9cf5578ec6d3b2
parent 5f9dd5cc38a4ae9596296e86ca66f865e6d4f366

Remove special-casing of qualifiers for locales such as sr-Latn

This was already done for aapt2; this CL removes it entirely from Bazel.

PiperOrigin-RevId: 285497421

src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java

diff --git a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
index f06ea73..8f6c265 100644
--- a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
+++ b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
@@ -536,25 +536,7 @@
       List<String> handledQualifiers = new ArrayList<>();
       // Do some substitution of language/region qualifiers.
       while (rawQualifiers.hasNext()) {
-        String qualifier = rawQualifiers.next();
-        if ("es".equalsIgnoreCase(qualifier)
-            && rawQualifiers.hasNext()
-            && "419".equalsIgnoreCase(rawQualifiers.peek())) {
-          // Replace the es-419.
-          handledQualifiers.add("b+es+419");
-          // Consume the next value, as it's been replaced.
-          rawQualifiers.next();
-        } else if ("sr".equalsIgnoreCase(qualifier)
-            && rawQualifiers.hasNext()
-            && "rlatn".equalsIgnoreCase(rawQualifiers.peek())) {
-          // Replace the sr-rLatn.
-          handledQualifiers.add("b+sr+Latn");
-          // Consume the next value, as it's been replaced.
-          rawQualifiers.next();
-        } else {
-          // This qualifier can probably be handled by FolderConfiguration.
-          handledQualifiers.add(qualifier);
-        }
+        handledQualifiers.add(rawQualifiers.next());
       }
       // Create a configuration
       FolderConfiguration config = FolderConfiguration.getConfigFromQualifiers(handledQualifiers);