Remove special-casing of qualifiers for locales such as sr-Latn
This was already done for aapt2; this CL removes it entirely from Bazel.
@@ -536,25 +536,7 @@ public class FullyQualifiedName implements DataKey {
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);
