From aa26b499f5f41c9e62414496df5c4430f9b579cd Mon Sep 17 00:00:00 2001
From: maniscalco <maniscalco@chromium.org>
Date: Wed, 13 Apr 2016 10:07:40 -0700
Subject: [PATCH] Update blimp build bot args match build/args/blimp_engine.gn

Reorder args so it's easier to spot differences.

Remove gyp_defines because blimp is not designed to build with gyp.

BUG=602696

Committed: https://crrev.com/55bf089c901fb38204b642edc847b6259697ee9e
Cr-Commit-Position: refs/heads/master@{#386760}

Review URL: https://codereview.chromium.org/1878273003

Cr-Commit-Position: refs/heads/master@{#387010}
---
 build/args/blimp_engine.gn |  3 +++
 tools/mb/mb_config.pyl     | 13 ++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/args/blimp_engine.gn b/build/args/blimp_engine.gn
index 2500b30b385d62..a5f20e3f0ce295 100644
--- a/build/args/blimp_engine.gn
+++ b/build/args/blimp_engine.gn
@@ -6,6 +6,9 @@
 # gn gen out/foo
 #
 # Use gn args to add your own build preference args.
+#
+# This list must be kept in sync with the blimp list in
+# //tools/mb/mb_config.pyl.
 
 use_aura = true
 use_ozone = true
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 37f531e24dc311..8033a8bdbb9e68 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -1567,11 +1567,14 @@
     # Removes dependencies on X11 and audio libraries for a containerized
     # build.
     'blimp': {
-      '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'),
+      # 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',
     },
 
     'cast': {