| Index: chrome/chrome.gyp
|
| ===================================================================
|
| --- chrome/chrome.gyp (revision 16417)
|
| +++ chrome/chrome.gyp (working copy)
|
| @@ -2024,6 +2024,14 @@
|
| }],
|
| ],
|
| }], # mac_breakpad
|
| + ['mac_keystone==1', {
|
| + 'copies': [
|
| + {
|
| + 'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Frameworks/',
|
| + 'files': ['../third_party/googlemac/Releases/Keystone/KeystoneRegistration.framework'],
|
| + },
|
| + ],
|
| + }], # mac_keystone
|
| ],
|
| 'product_name': '<(mac_product_name)',
|
| 'xcode_settings': {
|
| @@ -2064,7 +2072,8 @@
|
| 'inputs': [],
|
| 'outputs': [],
|
| 'action': ['<(DEPTH)/build/mac/tweak_app_infoplist',
|
| - '-b', '<(mac_breakpad)',
|
| + '-b<(mac_breakpad)',
|
| + '-k<(mac_keystone)',
|
| '<(branding)'],
|
| },
|
| ],
|
| @@ -3026,9 +3035,9 @@
|
| },
|
| ],
|
| 'conditions': [
|
| - # We set a feature variable so the different parts that need to check for
|
| - # the mac build use of breakpad, check that flag instead of coding it based
|
| - # on branding.
|
| + # We set feature variables so the different parts that need to check for
|
| + # the mac build use of breakpad/keystone, check that flag instead of coding
|
| + # it based on branding.
|
| # We need the Mac app name on disk, so we stick this into a variable so
|
| # the different places that need it can use the common variable.
|
| # NOTE: chrome/app/theme/chromium/BRANDING and
|
| @@ -3038,11 +3047,13 @@
|
| ['OS=="mac" and branding=="Chrome"', {
|
| 'variables': {
|
| 'mac_breakpad%': 1,
|
| + 'mac_keystone%': 1,
|
| 'mac_product_name%': 'Google Chrome',
|
| }
|
| }, {
|
| 'variables': {
|
| 'mac_breakpad%': 0,
|
| + 'mac_keystone%': 0,
|
| 'mac_product_name%': 'Chromium',
|
| }
|
| }],
|
|
|