Pass --undefok to DM and nanobench for more graceful branch failure.

scripts/slave/recipe_modules/skia/api.py

 # Copyright 2014 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.
 
 
 from slave import recipe_api
 from slave import recipe_config_types
 from common.skia import builder_name_schema
 from common.skia import global_constants
 from . import android_flavor
@@ skipping 298 matching lines @@
           cwd=self.skia_dir)
     except self.m.step.StepFailure:
       pass
     if self.m.path.exists(host_hashes_file):
       self.flavor.copy_file_to_device(host_hashes_file, hashes_file)
       use_hash_file = True
 
     # Run DM.
     args = [
       'dm',
+      '--undefok',   # This helps branches that may not know new flags.
       '--verbose',
       '--resourcePath', self.device_dirs.resource_dir,
       '--skps',         self.device_dirs.skp_dir,
       '--images',       self.device_dirs.images_dir,
       '--writePath',    self.device_dirs.dm_dir,
       '--nameByHash',
       '--properties',  'gitHash',      self.got_revision,
                        'build_number', self.m.properties['buildnumber'],
     ]
     args.append('--key')
@@ skipping 58 matching lines @@
     if 'ZeroGPUCache' in self.c.BUILDER_NAME:
       return
 
     self._run_once(self.install)
     self._run_once(self.download_and_copy_skps)
     is_perf = self.c.role == builder_name_schema.BUILDER_ROLE_PERF
     if is_perf:
       self.flavor.create_clean_device_dir(self.device_dirs.perf_data_dir)
 
     # Run nanobench.
-    args = ['nanobench', '-i', self.device_dirs.resource_dir,
-            '--skps', self.device_dirs.skp_dir]
+    args = [
+        'nanobench',
+        '--undefok',   # This helps branches that may not know new flags.
+        '-i', self.device_dirs.resource_dir,
+        '--skps', self.device_dirs.skp_dir
+    ]
 
     skip_flag = None
     if self.c.builder_cfg.get('cpu_or_gpu') == 'CPU':
       skip_flag = '--nogpu'
     elif self.c.builder_cfg.get('cpu_or_gpu') == 'GPU':
       skip_flag = '--nocpu'
     if skip_flag:
       args.append(skip_flag)
 
     args.extend(self.flags_from_file(self.skia_dir.join(
@@ skipping 52 matching lines @@
     # TryBots are uploaded elsewhere so they can use the same key.
     blacklist = ['role', 'is_trybot']
 
     params = builder_name_schema.DictForBuilderName(self.c.BUILDER_NAME)
     flat = []
     for k in sorted(params.keys()):
       if k not in blacklist:
         flat.append(k)
         flat.append(params[k])
     return flat