Turn on pseudo locale generation for compilation.

RELNOTES: android_binary.aapt_version='aapt2' now supports en_XA and ar_XB PiperOrigin-RevId: 198555305
s-pace · May 30, 2018 · 90446c1 · 90446c1
1 parent 99a7c44
commit 90446c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java b/...tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java
@@ -421,7 +421,7 @@ private List<String> convertToQualifiers(ConfigValue configValue) {
       // 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
@@ -180,7 +180,7 @@ public class Aapt2ConfigOptions extends OptionsBase {
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     name = "generatePseudoLocale",
-    defaultValue = "false",
+    defaultValue = "true",
     category = "config",
     help = "Whether to generate pseudo locales during compilation."
   )