Turn on pseudo locale generation for compilation.
RELNOTES: android_binary.aapt_version='aapt2' now supports en_XA and ar_XB
PiperOrigin-RevId: 198555305
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 8c24031..b4ba3761 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
@@ -421,7 +421,7 @@
// The proto stores it in a BCP-47 format, but the parser requires a b+ and all the - as +.
// It's a nice a little impedance mismatch.
new LocaleQualifier()
- .checkAndSet("b+" + protoConfig.getLocale().replaceAll("-", "+"), configuration);
+ .checkAndSet("b+" + protoConfig.getLocale().replace("-", "+"), configuration);
}
if (LAYOUT_DIRECTION_MAP.containsKey(protoConfig.getLayoutDirection())) {
diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/Aapt2ConfigOptions.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/Aapt2ConfigOptions.java
index 3a9aca8..c0ae124 100644
--- a/src/tools/android/java/com/google/devtools/build/android/aapt2/Aapt2ConfigOptions.java
+++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/Aapt2ConfigOptions.java
@@ -180,7 +180,7 @@
documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
effectTags = {OptionEffectTag.UNKNOWN},
name = "generatePseudoLocale",
- defaultValue = "false",
+ defaultValue = "true",
category = "config",
help = "Whether to generate pseudo locales during compilation."
)
