Merge trunk r35030 to the 249 branch

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,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 3809 matching lines @@
               'postbuild_name': 'Copy <(mac_product_name) Framework.framework',
               'action': [
                 'tools/build/mac/copy_framework_unversioned',
                 '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Framework.framework',
                 '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Versions/<(version_full)',
               ],
             },
             {
               # Modify the Info.plist as needed.  The script explains why this
               # is needed.  This is also done in the helper_app and chrome_dll
-              # targets.  Use -b0 and -k0 to not include any Breakpad or
-              # Keystone information; that all goes into the framework's
-              # Info.plist.  Use -s1 to include Subversion information.
+              # targets.  Use -b0 to not include any Breakpad information; that
+              # all goes into the framework's Info.plist.  Keystone information
+              # is included if Keystone is enabled because the ticket will
+              # reference this Info.plist to determine the tag of the installed
+              # product.  Use -s1 to include Subversion information.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['<(tweak_info_plist_path)',
                          '-b0',
-                         '-k0',
+                         '-k<(mac_keystone)',
                          '-s1',
                          '<(branding)',
                          '<(mac_bundle_id)'],
             },
             {
               'postbuild_name': 'Clean up old versions',
               'action': [
                 'tools/build/mac/clean_up_old_versions',
                 '<(version_full)'
               ],
@@ skipping 3248 matching lines @@
       ]
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: