Revert of Use GN in simple chrome builders

tools/mb/mb_config.pyl

 # Copyright 2015 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.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 48 matching lines @@
     },
 
     'chromium.chrome': {
       'Google Chrome ChromeOS': 'gyp_official_goma_chromeos',
       'Google Chrome Linux x64': 'gn_official_goma',
       'Google Chrome Mac': 'gyp_official_goma',
       'Google Chrome Win': 'gyp_official_goma_minimal_symbols_x86',
     },
 
     'chromium.chromiumos': {
-      'ChromiumOS amd64-generic Compile': 'cros_chrome_sdk_gn',
-      'ChromiumOS daisy Compile': 'cros_chrome_sdk_gn',
-      'ChromiumOS x86-generic Compile': 'cros_chrome_sdk_gn',
+      'ChromiumOS amd64-generic Compile': 'cros_chrome_sdk_gyp',
+      'ChromiumOS daisy Compile': 'cros_chrome_sdk_gyp',
+      'ChromiumOS x86-generic Compile': 'cros_chrome_sdk_gyp',
       'Linux ChromiumOS Builder': 'swarming_chromeos_gyp_release_bot',
       'Linux ChromiumOS Builder (dbg)': 'swarming_chromeos_gyp_debug_bot',
       'Linux ChromiumOS Full': 'swarming_chromeos_gyp_release_bot',
       'Linux ChromiumOS GN (dbg)': 'chromeos_gn_debug_bot',
       'Linux ChromiumOS GN': 'chromeos_ozone_gn_release_bot',
       'Linux ChromiumOS Ozone Builder':
           'swarming_chromeos_ozone_gyp_release_bot',
       'Linux ChromiumOS Ozone Tests (1)': 'none',
       'Linux ChromiumOS Tests (1)': 'none',
       'Linux ChromiumOS Tests (dbg)(1)': 'none',
@@ skipping 962 matching lines @@
     'chromeos_ozone_gn_release_trybot': [
       'chromeos', 'ozone', 'gn', 'release_trybot',
     ],
 
     # The 'cros_chrome_sdk_* configs are placeholders that indicate
     # that the GYP_DEFINES (or GN args) are set by the `cros chrome-sdk`
     # wrapper and need to be looked at specially.
     'cros_chrome_sdk_gyp': [
       'gyp', 'cros_chrome_sdk',
     ],
-    'cros_chrome_sdk_gn': [
-      'gn', 'cros_chrome_sdk',
-    ],
 
     # The 'findit' config is used by the *_variable_* bots, which run
     # the 'FindIt' recipes and code to bisect failures that happen on the
     # other waterfall bots. The findit recipes actually override and
     # re-use the configs from the matching waterfall bots, and so it should
     # be an error if MB ever sees an actual *_variable_* bot name.
     'findit': [
       'error',
     ],
 
@@ skipping 1199 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }