Stop shortening the Mac lproj directories (ie-"en-US" instead of "en")....

chrome/chrome.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     # Whether or not browser sync code is built in.
     'chrome_personalization': 1,
@@ skipping 3129 matching lines @@
             {
               # Modify the Info.plist as needed.  The script explains why this
               # is needed.  This is also done in the helper_app target.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['<(DEPTH)/build/mac/tweak_app_infoplist',
                          '-b<(mac_breakpad)',
                          '-k<(mac_keystone)',
                          '-s1',  # Include Subversion information
                          '<(branding)'],
             },
-          ],
+            {
+              'postbuild_name': 'Tweak Mac lproj folders',
+              'action': ['app/tweak_mac_lproj_folders'],
+            },
+          ],  # postbuilds
         }, { # else: OS != "mac"
           'conditions': [
             ['branding=="Chrome"', {
               'product_name': 'chrome'
             }, {  # else: Branding!="Chrome"
               # TODO:  change to:
               #   'product_name': 'chromium'
               # whenever we convert the rest of the infrastructure
               # (buildbots etc.) to use "gyp -Dbranding=Chrome".
               # NOTE: chrome/app/theme/chromium/BRANDING and
@@ skipping 154 matching lines @@
               'conditions': [
                 ['OS=="linux"', {
                   'outputs=': [
                     '<(INTERMEDIATE_DIR)/repack/default.pak',
                   ]
                 }],
               ],
             },
             {
               'action_name': 'repack_locales',
+              'process_outputs_as_mac_bundle_resources': 1,
               'variables': {
                 'conditions': [
                   ['branding=="Chrome"', {
                     'branding_flag': ['-b', 'google_chrome',],
                   }, {  # else: branding!="Chrome"
                     'branding_flag': ['-b', 'chromium',],
                   }],
                 ],
               },
               'inputs': [
                 'tools/build/repack_locales.py',
                 # NOTE: Ideally the common command args would be shared amongst
                 # inputs/outputs/action, but the args include shell variables
                 # which need to be passed intact, and command expansion wants
                 # to expand the shell variables. Adding the explicit quoting
                 # here was the only way it seemed to work.
                 '>!@(<(repack_locales_cmd) -i <(branding_flag) -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
               ],
-              'conditions': [
-                ['OS=="mac"', {
-                  'process_outputs_as_mac_bundle_resources': 1,
-                  'variables': {
-                    'locales=': [ 'da', 'en-US', 'he', 'zh-TW', ],
-                  },
-                  'outputs': [
-                    '<(INTERMEDIATE_DIR)/repack/da.lproj/locale.pak',
-                    '<(INTERMEDIATE_DIR)/repack/en.lproj/locale.pak',
-                    '<(INTERMEDIATE_DIR)/repack/he.lproj/locale.pak',
-                    '<(INTERMEDIATE_DIR)/repack/zh.lproj/locale.pak',
-                  ],
-                }, {  # else: OS!="mac"
-                  'outputs': [
-                    '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
-                  ],
-                }],
+              'outputs': [
+                '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
               ],
               'action': ['<@(repack_locales_cmd)',
                 '<@(branding_flag)',
                 '-g', '<(grit_out_dir)',
                 '-s', '<(SHARED_INTERMEDIATE_DIR)',
                 '-x', '<(INTERMEDIATE_DIR)',
                 '<@(locales)',
               ],
             },
           ],
@@ skipping 2129 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }