Chromium Code Reviews| Index: chrome/tools/build/repack_locales.py |
| diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py |
| index bd183a967bd74f293ebd60e80309d02b1f849505..6073458712ebd7c0addddc52bd275601775355dc 100755 |
| --- a/chrome/tools/build/repack_locales.py |
| +++ b/chrome/tools/build/repack_locales.py |
| @@ -34,6 +34,7 @@ CHROMEOS = False |
| USE_ASH = False |
| ENABLE_AUTOFILL_DIALOG = False |
| +ENABLE_EXTENSIONS = False |
| WHITELIST = None |
| @@ -101,15 +102,22 @@ def calc_inputs(locale): |
| inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings', |
| 'ui_strings_%s.pak' % locale)) |
| + #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_da.pak', |
|
miket_OOO
2014/08/11 23:35:32
I'm not sure why this moved, but it seems to be a
Lei Zhang
2014/08/11 23:37:55
It's just the way the diff came out when I moved b
|
| + inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings', |
| + 'app_locale_settings_%s.pak' % locale)) |
| + |
| + if ENABLE_AUTOFILL_DIALOG and OS != 'ios' and OS != 'android': |
| + #e.g. '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/ |
| + # address_input_strings_da.pak', |
| + inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'libaddressinput', |
| + 'address_input_strings_%s.pak' % locale)) |
| + |
| + if ENABLE_EXTENSIONS: |
| #e.g. '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings/ |
| # device_bluetooth_strings_da.pak', |
| inputs.append(os.path.join(SHARE_INT_DIR, 'device', 'bluetooth', 'strings', |
| 'device_bluetooth_strings_%s.pak' % locale)) |
| - #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_da.pak', |
| - inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings', |
| - 'app_locale_settings_%s.pak' % locale)) |
| - |
| # For example: |
| # '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_da.pak |
| # TODO(jamescook): When Android stops building extensions code move this |
| @@ -117,12 +125,6 @@ def calc_inputs(locale): |
| inputs.append(os.path.join(SHARE_INT_DIR, 'extensions', 'strings', |
| 'extensions_strings_%s.pak' % locale)) |
| - if ENABLE_AUTOFILL_DIALOG and OS != 'ios' and OS != 'android': |
| - #e.g. '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/ |
| - # address_input_strings_da.pak', |
| - inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'libaddressinput', |
| - 'address_input_strings_%s.pak' % locale)) |
| - |
| #e.g. '<(grit_out_dir)/google_chrome_strings_da.pak' |
| # or |
| # '<(grit_out_dir)/chromium_strings_da.pak' |
| @@ -183,6 +185,7 @@ def DoMain(argv): |
| global USE_ASH |
| global WHITELIST |
| global ENABLE_AUTOFILL_DIALOG |
| + global ENABLE_EXTENSIONS |
| global EXTRA_INPUT_FILES |
| parser = optparse.OptionParser("usage: %prog [options] locales") |
| @@ -212,6 +215,9 @@ def DoMain(argv): |
| parser.add_option("--enable-autofill-dialog", action="store", |
| dest="enable_autofill_dialog", |
| help="Whether to include strings for autofill dialog") |
| + parser.add_option("--enable-extensions", action="store", |
| + dest="enable_extensions", |
| + help="Whether to include strings for extensions") |
| options, locales = parser.parse_args(argv) |
| if not locales: |
| @@ -229,6 +235,7 @@ def DoMain(argv): |
| USE_ASH = options.use_ash == '1' |
| WHITELIST = options.whitelist |
| ENABLE_AUTOFILL_DIALOG = options.enable_autofill_dialog == '1' |
| + ENABLE_EXTENSIONS = options.enable_extensions == '1' |
| if not OS: |
| if sys.platform == 'darwin': |