- Roll DEPS to pick up newer GYP...

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,
+    # Mac NOTE: at the start of the conditions block we default some vars
+    # that control features based on the branding, this way each place that
+    # needs to know about the feature isn't hard coded to the branding type.
   },
   'includes': [
     '../build/common.gypi',
   ],
   'target_defaults': {
     'sources/': [
       ['exclude', '/(cocoa|gtk|win)/'],
       ['exclude', '_(cocoa|gtk|linux|mac|posix|skia|win|x)\\.(cc|mm?)$'],
       ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
     ],
@@ skipping 1938 matching lines @@
           # NOTE: chrome/app/theme/chromium/BRANDING and 
           # chrome/app/theme/google_chrome/BRANDING have the short names, etc.;
           # should we try to extract from there instead?
           'product_name': '<(branding)',
           'conditions': [
             ['branding=="Chrome"', {
               'mac_bundle_resources': ['app/theme/google_chrome/app.icns'],
               'variables': {
                 'bundle_id': 'com.google.Chrome',
               },
+            }, {  # else: 'branding!="Chrome"
+              'mac_bundle_resources': ['app/theme/chromium/app.icns'],
+              'variables': {
+                'bundle_id': 'org.chromium.Chromium',
+              },
+            }],
+            ['mac_breakpad==1', {
               # Only include breakpad in official builds.
               'dependencies': [
                 '../breakpad/breakpad.gyp:breakpad',
+                '../breakpad/breakpad.gyp:dump_syms',
               ],
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)/<(branding).app/Contents/Resources/',
                   'files': ['<(PRODUCT_DIR)/crash_inspector', '<(PRODUCT_DIR)/crash_report_sender.app'],
                 },
-              ]
-            }, {  # else: branding!="Chrome"
-              'mac_bundle_resources': ['app/theme/chromium/app.icns'],
-              'variables': {
-                'bundle_id': 'org.chromium.Chromium',
-              },
-            }],
+              ],
+              'target_conditions': [
+                # We use target_conditions here that is always true to force
+                # this post build to run last.  This lets the strip from
+                # common.gypi go ahead of it, so we can always hit the
+                # upstripped app within the fake dSYM.
+                ['1', {
+                  'postbuilds': [
+                    {
+                      'postbuild_name': 'Dump Symbols',
+                      'action': ['<(DEPTH)/build/mac/dump_app_syms',
+                                 '<(branding)'],
+                    },
+                  ],
+                }],
+              ],
+            }], # mac_breakpad
           ],
           'xcode_settings': {
             # chrome/app/app-Info.plist has a CFBundleIdentifier of
             # CHROMIUM_BUNDLE_ID to be replaced by a branded bundle ID in Xcode
             # with this settings.
             'CHROMIUM_BUNDLE_ID': '<(bundle_id)',
           },
         }, { # else: OS != "mac"
           'conditions': [
             ['branding=="Chrome"', {
@@ skipping 16 matching lines @@
           'actions': [
             {
               'action_name': 'tweak_app_infoplist',
               # We don't list any inputs or outputs because we always want
               # the script to run.  Why?  Because it does thinks like record
               # the svn revision into the info.plist, so there is no file to
               # depend on that will change when ever that changes.
               'inputs': [],
               'outputs': [],
               'action': ['<(DEPTH)/build/mac/tweak_app_infoplist',
+                         '-b', '<(mac_breakpad)',
                          '<(branding)'],
             },
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',
           ],
           'dependencies': [
             'views',
@@ skipping 919 matching lines @@
         }],
         ['OS!="win"', {
           'sources!': [
             'test/perf/mem_usage.cc',
           ],
         }],
       ],
     },
   ],
   'conditions': [
+    # We set a few feature variables so the different parts that need to check
+    # for the mac build, check that flag instead of coding it based on branding.
+    ['OS=="mac" and branding=="Chrome"', {
+      'variables': {
+        'mac_breakpad%': 1
+      }
+    }, {
+      'variables': {
+        'mac_breakpad%': 0
+      }
+    }],
     ['OS=="linux"', {
       'targets': [
         {
           'target_name': 'convert_dict',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'third_party/hunspell/hunspell.gyp:hunspell',
           ],
           'sources': [
@@ skipping 549 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'
 }