diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_repack_locales.gypi | 2 | ||||
| -rwxr-xr-x | chrome/tools/build/repack_locales.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/chrome/chrome_repack_locales.gypi b/chrome/chrome_repack_locales.gypi index 0e24ee2..28515c7 100644 --- a/chrome/chrome_repack_locales.gypi +++ b/chrome/chrome_repack_locales.gypi @@ -7,6 +7,7 @@ { 'variables': { 'repack_locales_path': 'tools/build/repack_locales.py', + 'repack_options%': [], 'conditions': [ ['branding=="Chrome"', { 'branding_flag': ['-b', 'google_chrome',], @@ -31,6 +32,7 @@ '-s', '<(SHARED_INTERMEDIATE_DIR)', '-x', '<(SHARED_INTERMEDIATE_DIR)/.', '--use-ash', '<(use_ash)', + '<@(repack_options)', '<@(pak_locales)', ], } diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py index 96f47eb..6dbcef5 100755 --- a/chrome/tools/build/repack_locales.py +++ b/chrome/tools/build/repack_locales.py @@ -31,6 +31,8 @@ OS = None USE_ASH = False +WHITELIST = None + # Extra input files. EXTRA_INPUT_FILES = [] @@ -153,7 +155,7 @@ def repack_locales(locales): inputs = [] inputs += calc_inputs(locale) output = calc_output(locale) - data_pack.DataPack.RePack(output, inputs) + data_pack.DataPack.RePack(output, inputs, whitelist_file=WHITELIST) def DoMain(argv): @@ -163,6 +165,7 @@ def DoMain(argv): global INT_DIR global OS global USE_ASH + global WHITELIST global EXTRA_INPUT_FILES parser = optparse.OptionParser("usage: %prog [options] locales") @@ -185,6 +188,8 @@ def DoMain(argv): help="The target OS. (e.g. mac, linux, win, etc.)") parser.add_option("--use-ash", action="store", dest="use_ash", help="Whether to include ash strings") + parser.add_option("--whitelist", action="store", help="Full path to the " + "whitelist used to filter output pak file resource IDs") options, locales = parser.parse_args(argv) if not locales: @@ -199,6 +204,7 @@ def DoMain(argv): EXTRA_INPUT_FILES = options.extra_input OS = options.os USE_ASH = options.use_ash == '1' + WHITELIST = options.whitelist if not OS: if sys.platform == 'darwin': |