Revert of Update blimp build bot args match build/args/blimp_engine.gn

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 1549 matching lines @@
     },
 
     'asan': {
       'gn_args': 'is_asan=true',
       'gyp_defines': 'asan=1',
     },
 
     # Removes dependencies on X11 and audio libraries for a containerized
     # build.
     'blimp': {
-      # This list must be kept in sync with the list in
-      # //build/args/blimp_engine.gn.
-      'gn_args': ('use_aura=true use_ozone=true ozone_auto_platforms=false '
-                  'ozone_platform="headless" ozone_platform_headless=true '
-                  'metrics_use_blimp=true '
-                  'use_low_quality_image_interpolation=true use_alsa=false '
-                  'use_pulseaudio=false use_cups=false use_glib=false'),
-      'gyp_defines': 'target_arch=unknown',
+      'gn_args': ('use_aura=true use_ozone=true use_alsa=false '
+                  'use_pulseaudio=false use_cups=false use_glib=false '
+                  'use_low_quality_image_interpolation=true'),
+      'gyp_defines': ('use_aura=1 use_ozone=1 use_alsa=0 '
+                      'use_pulseaudio=0 use_cups=0 use_glib=0'),
     },
 
     'cast': {
       'gn_args': 'is_chromecast=true',
       'gyp_defines': 'chromecast=1',
     },
 
     'cfi': {
       'gn_args': 'is_cfi=true',
       'gyp_defines': 'cfi_vptr=1',
@@ skipping 270 matching lines @@
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
 
     'valgrind': {
       # TODO: add gn_args for 'build_for_tool=memcheck'
       'gyp_defines': 'build_for_tool=memcheck',
     }
   },
 }