Merge 69172 - Add an official target in the gyp file for the official builder...

build/all.gyp

 # Copyright (c) 2010 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.
 
 {
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
@@ skipping 301 matching lines @@
             '../jingle/jingle.gyp:notifier_unit_tests',
             '../media/media.gyp:media_unittests',
             '../net/net.gyp:net_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
           ],
         },
       ],  # targets
+      'conditions': [
+        ['(branding=="Chrome" and buildtype=="Official")', {
+          'targets': [
+            {
+              'target_name': 'chrome_official_builder',
+              'type': 'none',
+              'dependencies': [
+                '../chrome/app/locales/locales.gyp:*',
+                '../chrome/chrome.gyp:crash_service',
+                '../chrome/chrome.gyp:page_cycler_tests',
+                '../chrome/chrome.gyp:pyautolib',
+                '../chrome/chrome.gyp:reliability_tests',
+                '../chrome/chrome.gyp:startup_tests',
+                '../chrome/chrome.gyp:automated_ui_tests',
+                '../chrome/installer/mini_installer.gyp:mini_installer',
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+                '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+                '../courgette/courgette.gyp:courgette',
+                '../pdf/pdf.gyp:pdf',
+                '../third_party/adobe/flash/flash_player.gyp:flash_player',
+                '../webkit/webkit.gyp:test_shell.gyp',
+              ],
+            },
+          ], # targets
+        }], # (branding=="Chrome" and buildtype=="Official")
+       ], # conditions
     }], # OS="win"
     ['chromeos==1', {
       'targets': [
         {
           'target_name': 'chromeos_builder',
           'type': 'none',
           'sources': [
             # TODO(bradnelson): This is here to work around gyp issue 137.
             #     Remove this sources list when that issue has been fixed.
             'all.gyp',
@@ skipping 30 matching lines @@
       ],  # targets
     }], # "chromeos==1"
   ], # conditions
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: