Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Regenerate LocaleDataTables.cpp" am: 6658c31b4e am: ccc64a5aef

Browse Source 
Change-Id: Ie1c1ae3210049bac2d005ed82b05b838ff25d183
This commit is contained in:
Automerger Merge Worker
2019-12-17 12:24:11 +00:00
parent 66d7bd23b5 ccc64a5aef
commit ffbeb382a2
2 changed files with 1386 additions and 1338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2717
libs/androidfw/LocaleDataTables.cpp
View File

File diff suppressed because it is too large Load Diff

7
tools/localedata/extract_icu_data.py
View File

@@ -176,6 +176,9 @@ def read_and_dump_likely_data(icu_data_dir):
dump_representative_locales(representative_locales)
return likely_script_dict
def escape_script_variable_name(script):
"""Escape characters, e.g. '~', in a C++ variable name"""
return script.replace("~", "_")
def read_parent_data(icu_data_dir):
"""Read locale parent data from ICU data files."""
@@ -221,7 +224,7 @@ def dump_parent_data(script_organized_dict):
for script in sorted_scripts:
parent_dict = script_organized_dict[script]
print ('const std::unordered_map<uint32_t, uint32_t> %s_PARENTS({'
% script.upper())
% escape_script_variable_name(script.upper()))
for locale in sorted(parent_dict.keys()):
parent = parent_dict[locale]
print ' {0x%08Xu, 0x%08Xu}, // %s -> %s' % (
@@ -239,7 +242,7 @@ def dump_parent_data(script_organized_dict):
for script in sorted_scripts:
print " {{'%c', '%c', '%c', '%c'}, &%s_PARENTS}," % (
script[0], script[1], script[2], script[3],
script.upper())
escape_script_variable_name(script.upper()))
print '};'