Commit 27cee79f authored by Tibor Goldschwendt's avatar Tibor Goldschwendt Committed by Commit Bot

[bundles] Add English strings to English language split

This works around a bug where the fallback language (English) doesn't
get installed by Play.

Bug: 901284
Change-Id: Iff059d45903e444fa74335845a0bac280dff456f
Reviewed-on: https://chromium-review.googlesource.com/c/1315692
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: default avataragrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605037}
parent 1f38adde
...@@ -171,9 +171,12 @@ def _RewriteLanguageAssetPath(src_path): ...@@ -171,9 +171,12 @@ def _RewriteLanguageAssetPath(src_path):
This will rewrite paths that look like locales/<locale>.pak into This will rewrite paths that look like locales/<locale>.pak into
locales#<language>/<locale>.pak, where <language> is the language code locales#<language>/<locale>.pak, where <language> is the language code
from the locale. from the locale.
Returns a list of paths. The language split should be duplicated at all the
returned paths.
""" """
if not src_path.startswith(_LOCALES_SUBDIR) or not src_path.endswith('.pak'): if not src_path.startswith(_LOCALES_SUBDIR) or not src_path.endswith('.pak'):
return src_path return [src_path]
locale = src_path[len(_LOCALES_SUBDIR):-4] locale = src_path[len(_LOCALES_SUBDIR):-4]
android_locale = resource_utils.CHROME_TO_ANDROID_LOCALE_MAP.get( android_locale = resource_utils.CHROME_TO_ANDROID_LOCALE_MAP.get(
...@@ -186,10 +189,11 @@ def _RewriteLanguageAssetPath(src_path): ...@@ -186,10 +189,11 @@ def _RewriteLanguageAssetPath(src_path):
else: else:
android_language = android_locale android_language = android_locale
result_paths = ['assets/locales#lang_%s/%s.pak' % (android_language, locale)]
if android_language == _FALLBACK_LANGUAGE: if android_language == _FALLBACK_LANGUAGE:
return 'assets/locales/%s.pak' % locale result_paths.append('assets/locales/%s.pak' % locale)
return 'assets/locales#lang_%s/%s.pak' % (android_language, locale) return result_paths
def _SplitModuleForAssetTargeting(src_module_zip, tmp_dir, split_dimensions): def _SplitModuleForAssetTargeting(src_module_zip, tmp_dir, split_dimensions):
...@@ -226,13 +230,16 @@ def _SplitModuleForAssetTargeting(src_module_zip, tmp_dir, split_dimensions): ...@@ -226,13 +230,16 @@ def _SplitModuleForAssetTargeting(src_module_zip, tmp_dir, split_dimensions):
src_path = info.filename src_path = info.filename
is_compressed = info.compress_type != zipfile.ZIP_STORED is_compressed = info.compress_type != zipfile.ZIP_STORED
dst_path = src_path dst_paths = [src_path]
if src_path in language_files: if src_path in language_files:
dst_path = _RewriteLanguageAssetPath(src_path) dst_paths = _RewriteLanguageAssetPath(src_path)
build_utils.AddToZipHermetic(dst_zip, dst_path, for dst_path in dst_paths:
data=src_zip.read(src_path), build_utils.AddToZipHermetic(
compress=is_compressed) dst_zip,
dst_path,
data=src_zip.read(src_path),
compress=is_compressed)
return tmp_zip return tmp_zip
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment