diff options
| author |  corysmith <corysmith@google.com> | 2018-05-30 07:12:49 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-30 07:14:21 -0700 |
| commit | 90446c1a1d3f4dcaf3d8ecb2a79b6eae1f3c5dfc (patch) | |
| tree | b50bcbc80c89340903633252a4b7d5cb45057e4f /src/tools | |
| parent | 99a7c444bdccb07beb457fb11c47214da2601d33 (diff) | |
Turn on pseudo locale generation for compilation.
RELNOTES: android_binary.aapt_version='aapt2' now supports en_XA and ar_XB
PiperOrigin-RevId: 198555305
Diffstat (limited to 'src/tools')
2 files changed, 2 insertions, 2 deletions
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 8c24031209..b4ba3761fe 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 @@ public class AndroidCompiledDataDeserializer implements AndroidDataDeserializer // 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 3a9aca84c3..c0ae124a51 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 @@ 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." ) |