Revert 282837 because it broke non-chromeos builds.

trunk/src/chrome/tools/build/repack_locales.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Helper script to repack paks for a list of locales.
 
 Gyp doesn't have any built-in looping capability, so this just provides a way to
 loop over a list of locales when repacking pak files, thus avoiding a
 proliferation of mostly duplicate, cut-n-paste gyp actions.
@@ skipping 11 matching lines @@
 BRANDING = None
 
 # Some build paths defined by gyp.
 GRIT_DIR = None
 SHARE_INT_DIR = None
 INT_DIR = None
 
 # The target platform. If it is not defined, sys.platform will be used.
 OS = None
 
-# Note that OS is normally set to 'linux' when building for chromeos.
-CHROMEOS = False
-
 USE_ASH = False
 ENABLE_AUTOFILL_DIALOG = False
 
 WHITELIST = None
 
 # Extra input files.
 EXTRA_INPUT_FILES = []
 
 class Usage(Exception):
   def __init__(self, msg):
@@ skipping 35 matching lines @@
   #e.g. '<(SHARED_INTERMEDIATE_DIR)/components/strings/
   # components_strings_da.pak',
   inputs.append(os.path.join(SHARE_INT_DIR, 'components', 'strings',
                 'components_strings_%s.pak' % locale))
 
   if USE_ASH:
     #e.g. '<(SHARED_INTERMEDIATE_DIR)/ash/strings/ash_strings_da.pak',
     inputs.append(os.path.join(SHARE_INT_DIR, 'ash', 'strings',
                   'ash_strings_%s.pak' % locale))
 
-  if CHROMEOS:
-    inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'chromeos', 'strings',
-                  'ui_chromeos_strings_%s.pak' % locale))
-
   if OS != 'ios':
     #e.g. '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak'
     inputs.append(os.path.join(SHARE_INT_DIR, 'webkit',
                   'webkit_strings_%s.pak' % locale))
 
     #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/strings_da.pak',
     inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings',
                   'ui_strings_%s.pak' % locale))
 
     #e.g. '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings/
@@ skipping 72 matching lines @@
     output = calc_output(locale)
     data_pack.DataPack.RePack(output, inputs, whitelist_file=WHITELIST)
 
 
 def DoMain(argv):
   global BRANDING
   global GRIT_DIR
   global SHARE_INT_DIR
   global INT_DIR
   global OS
-  global CHROMEOS
   global USE_ASH
   global WHITELIST
   global ENABLE_AUTOFILL_DIALOG
   global EXTRA_INPUT_FILES
 
   parser = optparse.OptionParser("usage: %prog [options] locales")
   parser.add_option("-i", action="store_true", dest="inputs", default=False,
                     help="Print the expected input file list, then exit.")
   parser.add_option("-o", action="store_true", dest="outputs", default=False,
                     help="Print the expected output file list, then exit.")
   parser.add_option("-g", action="store", dest="grit_dir",
                     help="GRIT build files output directory.")
   parser.add_option("-x", action="store", dest="int_dir",
                     help="Intermediate build files output directory.")
   parser.add_option("-s", action="store", dest="share_int_dir",
                     help="Shared intermediate build files output directory.")
   parser.add_option("-b", action="store", dest="branding",
                     help="Branding type of this build.")
   parser.add_option("-e", action="append", dest="extra_input", default=[],
                     help="Full path to an extra input pak file without the\
                          locale suffix and \".pak\" extension.")
   parser.add_option("-p", action="store", dest="os",
                     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("--chromeos", action="store_true",
-                    help="Whether building for Chrome OS", default = False)
   parser.add_option("--whitelist", action="store", help="Full path to the "
                     "whitelist used to filter output pak file resource IDs")
   parser.add_option("--enable-autofill-dialog", action="store",
                     dest="enable_autofill_dialog",
                     help="Whether to include strings for autofill dialog")
   options, locales = parser.parse_args(argv)
 
   if not locales:
     parser.error('Please specificy at least one locale to process.\n')
 
   print_inputs = options.inputs
   print_outputs = options.outputs
   GRIT_DIR = options.grit_dir
   INT_DIR = options.int_dir
   SHARE_INT_DIR = options.share_int_dir
   BRANDING = options.branding
   EXTRA_INPUT_FILES = options.extra_input
   OS = options.os
-  CHROMEOS = options.chromeos
   USE_ASH = options.use_ash == '1'
   WHITELIST = options.whitelist
   ENABLE_AUTOFILL_DIALOG = options.enable_autofill_dialog == '1'
 
   if not OS:
     if sys.platform == 'darwin':
       OS = 'mac'
     elif sys.platform.startswith('linux'):
       OS = 'linux'
     elif sys.platform in ('cygwin', 'win32'):
@@ skipping 14 matching lines @@
 
   if print_outputs:
     return list_outputs(locales)
 
   return repack_locales(locales)
 
 if __name__ == '__main__':
   results = DoMain(sys.argv[1:])
   if results:
     print results