diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2015-01-20 13:52:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-20 21:53:39 +0000 |
| commit | 5748e135876286766151600a96283d369dba6584 (patch) | |
| tree | 7915384a37cb5a3d001170c12b7d6e77f3d2d716 /chrome/tools | |
| parent | c1b6156b0820a71a933ffd5e9c28da396003dc2d (diff) | |
| download | chromium_src-5748e135876286766151600a96283d369dba6584.zip chromium_src-5748e135876286766151600a96283d369dba6584.tar.gz chromium_src-5748e135876286766151600a96283d369dba6584.tar.bz2 | |
Remove remainder of Athena related code from Chrome.
This CL:
- Removes athena dependencies from build files for the chrome target
- Removes athena-specific files in chrome/
BUG=440818
TEST=None
R=sky,scottmg
TBR=jamescook (for change to comment in extensions/shell/browser/desktop_controller.h)
Review URL: https://codereview.chromium.org/855753004
Cr-Commit-Position: refs/heads/master@{#312282}
Diffstat (limited to 'chrome/tools')
| -rwxr-xr-x | chrome/tools/build/repack_locales.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py index a5a8e9f..8fddff8 100755 --- a/chrome/tools/build/repack_locales.py +++ b/chrome/tools/build/repack_locales.py @@ -33,7 +33,6 @@ OS = None CHROMEOS = False USE_ASH = False -USE_ATHENA = False ENABLE_AUTOFILL_DIALOG = False ENABLE_EXTENSIONS = False @@ -89,11 +88,6 @@ def calc_inputs(locale): inputs.append(os.path.join(SHARE_INT_DIR, 'ash', 'strings', 'ash_strings_%s.pak' % locale)) - if USE_ATHENA: - #e.g. '<(SHARED_INTERMEDIATE_DIR)/athena/strings/athena_strings_da.pak', - inputs.append(os.path.join(SHARE_INT_DIR, 'athena', 'strings', - 'athena_strings_%s.pak' % locale)) - if CHROMEOS: inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'chromeos', 'strings', 'ui_chromeos_strings_%s.pak' % locale)) @@ -191,7 +185,6 @@ def DoMain(argv): global OS global CHROMEOS global USE_ASH - global USE_ATHENA global WHITELIST global ENABLE_AUTOFILL_DIALOG global ENABLE_EXTENSIONS @@ -217,8 +210,6 @@ 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("--use-athena", action="store", dest="use_athena", - help="Whether to include athena strings") parser.add_option("--chromeos", action="store", help="Whether building for Chrome OS") parser.add_option("--whitelist", action="store", help="Full path to the " @@ -244,7 +235,6 @@ def DoMain(argv): OS = options.os CHROMEOS = options.chromeos == '1' USE_ASH = options.use_ash == '1' - USE_ATHENA = options.use_athena == '1' WHITELIST = options.whitelist ENABLE_AUTOFILL_DIALOG = options.enable_autofill_dialog == '1' ENABLE_EXTENSIONS = options.enable_extensions == '1' |