Make chromeos-amd64-generic-rel use the new Simple Chrome flow.

This uses the args file dropped under //build/args/chromeos/ for the
amd64-generic bot instead of reading the args from an env var set by
simple chrome sdk.

Bug: 812428
Change-Id: I705167bddd80ed18ead543f79270d7afaebc386f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088508
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748764}

tools/mb/mb.py

@@ -46,6 +46,7 @@ def DefaultVals():
   """Default mixin values"""
   return {
       'args_file': '',
+      # TODO(crbug.com/937821): Get rid of 'cros_passthrough'.
       'cros_passthrough': False,
       'gn_args': '',
   }
@@ -1306,8 +1307,9 @@ class MetaBuildWrapper(object):
     # since that makes incremental builds incorrect. See
     # https://crbug.com/912946
     is_android = 'target_os="android"' in vals['gn_args']
-    is_cros = ('target_os="chromeos"' in vals['gn_args'] or
-               vals.get('cros_passthrough', False))
+    is_cros = ('target_os="chromeos"' in vals['gn_args']
+               or 'is_chromeos_device=true' in vals['gn_args']
+               or vals.get('cros_passthrough', False))
     is_mac = self.platform == 'darwin'
     is_msan = 'is_msan=true' in vals['gn_args']
     is_ios = 'target_os="ios"' in vals['gn_args']
@@ -1500,7 +1502,8 @@ class MetaBuildWrapper(object):
     is_fuchsia = 'target_os="fuchsia"' in vals['gn_args']
     is_cros = 'target_os="chromeos"' in vals['gn_args']
     is_ios = 'target_os="ios"' in vals['gn_args']
-    is_simplechrome = vals.get('cros_passthrough', False)
+    is_cros_device = ('is_chromeos_device=true' in vals['gn_args']
+                      or vals.get('cros_passthrough', False))
     is_mac = self.platform == 'darwin'
     is_win = self.platform == 'win32' or 'target_os="win"' in vals['gn_args']
 
@@ -1574,7 +1577,7 @@ class MetaBuildWrapper(object):
           '--test-launcher-bot-mode',
           '--system-log-file', '${ISOLATED_OUTDIR}/system_log'
       ]
-    elif is_simplechrome and test_type != 'script':
+    elif is_cros_device and test_type != 'script':
       cmdline += [
           '../../testing/test_env.py',
           os.path.join('bin', 'run_%s' % target),
@@ -1613,7 +1616,7 @@ class MetaBuildWrapper(object):
     elif test_type == 'script':
       # If we're testing a CrOS simplechrome build, assume we need to prepare a
       # DUT for testing. So prepend the command to run with the test wrapper.
-      if is_simplechrome:
+      if is_cros_device:
         cmdline = [
             os.path.join('bin', 'cros_test_wrapper'),
             '--logs-dir=${ISOLATED_OUTDIR}',

tools/mb/mb_config.pyl

@@ -98,7 +98,7 @@
       'chromeos-amd64-generic-asan-rel': 'cros_chrome_sdk_asan',
       'chromeos-amd64-generic-cfi-thin-lto-rel': 'cros_chrome_sdk_cfi_thin_lto',
       'chromeos-amd64-generic-dbg': 'cros_chrome_sdk_dbg',
-      'chromeos-amd64-generic-rel': 'cros_chrome_sdk',
+      'chromeos-amd64-generic-rel': 'chromeos_amd64-generic',
       'chromeos-arm-generic-dbg': 'cros_chrome_sdk_dbg',
       'chromeos-arm-generic-rel': 'cros_chrome_sdk',
       'chromeos-kevin-rel': 'cros_chrome_sdk',
@@ -755,7 +755,7 @@
       # and two kevin bots when the PFQ has it enabled.
       'chromeos-amd64-generic-cfi-thin-lto-rel': 'cros_chrome_sdk_cfi_thin_lto',
       'chromeos-amd64-generic-dbg': 'cros_chrome_sdk_dbg',
-      'chromeos-amd64-generic-rel': 'cros_chrome_sdk',
+      'chromeos-amd64-generic-rel': 'chromeos_amd64-generic',
       'chromeos-arm-generic-dbg': 'cros_chrome_sdk_dbg',
       'chromeos-arm-generic-rel': 'cros_chrome_sdk_dcheck_always_on',
       'chromeos-kevin-compile-rel': 'cros_chrome_sdk',
@@ -1342,6 +1342,10 @@
       'cfi_full', 'cfi_icall', 'cfi_diag', 'thin_lto', 'release', 'static', 'dcheck_always_on', 'goma',
     ],
 
+    'chromeos_amd64-generic': [
+      'chromeos_device', 'amd64-generic',
+    ],
+
     'chromeos_asan_lsan_fuzzer_v8_heap_release_bot': [
       'chromeos', 'asan', 'lsan', 'fuzzer', 'v8_heap', 'release_bot',
     ],
@@ -2056,6 +2060,10 @@
   'mixins': {
     'afl': { 'gn_args': 'use_afl=true' },
 
+    'amd64-generic': {
+      'args_file': '//build/args/chromeos/amd64-generic.gni',
+    },
+
     # We build Android with codecs on most bots to ensure maximum test
     # coverage, but use 'android_without_codecs' on bots responsible for
     # building publicly advertised non-Official Android builds --
@@ -2149,6 +2157,11 @@
       'mixins': ['ffmpeg_branding_chromeos', 'proprietary_codecs'],
     },
 
+    'chromeos_device': {
+      'gn_args': 'is_chromeos_device=true ozone_platform_headless=true',
+      'mixins': ['goma'],
+    },
+
     'chromeos_with_codecs': {
       'mixins': ['chromeos', 'chromeos_codecs'],
     },