Android: Stop including unsupport locales in resources.arsc

chrome/android/chrome_public_apk_tmpl.gni

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 import("//third_party/leakcanary/config.gni")
 import("channel.gni")
 
 declare_args() {
   # Whether chrome_public_apk should use the crazy linker.
   chrome_public_apk_use_chromium_linker = chromium_linker_supported
 
   # Whether chrome_public_apk should use the relocation packer.
   chrome_public_apk_use_relocation_packer = chromium_linker_supported
@@ skipping 17 matching lines @@
   "enable_webvr=$enable_webvr",
 ]
 
 template("chrome_public_apk_tmpl") {
   android_apk(target_name) {
     forward_variables_from(invoker, "*")
     _native_lib_file =
         rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
     native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
     native_lib_version_rule = "//build/util:chrome_version_json"
+    if (!defined(aapt_locale_whitelist)) {
+      aapt_locale_whitelist = locales - android_chrome_omitted_locales
+    }
 
     if (is_java_debug) {
       enable_multidex = true
     } else {
       proguard_enabled = true
       if (!defined(proguard_configs)) {
         proguard_configs = []
       }
       proguard_configs += [
         "//chrome/android/java/proguard.flags",
@@ skipping 38 matching lines @@
           [ "//chrome/android:monochrome_secondary_abi_lib" ]
     }
 
     alternative_android_sdk_jar = webview_framework_jar
     app_as_shared_lib = true
     use_chromium_linker = false
     requires_sdk_api_level_23 = true
     enable_relocation_packing = true
     extensions_to_not_compress = ".lpak,.pak,.bin,.dat"
 
+    # Webview supports all locales (has no omitted ones).
+    aapt_locale_whitelist = locales
+
     # Incremental install doesn't work for monochrome. See crbug.com/663492.
     never_incremental = true
 
     # Configrations to make android load shared library from APK.
     uncompress_shared_libraries = true
     page_align_shared_libraries = true
 
     forward_variables_from(invoker, "*")
 
     if (!defined(deps)) {
       deps = []
     }
     deps += [
       "//android_webview:monochrome_webview_assets",
       "//android_webview/glue",
       "//chrome/android:chrome_public_non_pak_assets",
       "//chrome/android:monochrome_pak_assets",
     ]
 
     if (!is_java_debug) {
       if (!defined(proguard_configs)) {
         proguard_configs = []
       }
       proguard_configs += [ "//android_webview/apk/java/proguard.flags" ]
     }
   }
 }