Restart codereview issue 6792042

buildbot/cbuildbot_config.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Dictionary of configuration types for cbuildbot.
 
 Each dictionary entry is in turn a dictionary of config_param->value.
 
 config_param's:
 board -- The board of the image to build.
@@ skipping 28 matching lines @@
 usepkg -- Use binary packages to bootstrap, when possible. (emerge --usepkg)
 chroot_replace -- wipe and replace chroot, but not source.
 
 gs_path -- Google Storage path to offload files to
 build_type -- Upload prebuilts under the specified category. Can be any of
               [preflight|full|chrome].
 test_mod -- Create a test mod image for archival.
 factory_install_mod -- Create a factory install image for archival.
 factory_test_mod -- Create a factory test image for archival.
 
+useflags -- Generic build modifying USE flags, passed as an array, or missing.
+
 git_url -- git repository URL for our manifests.
            External: http://git.chromium.org/git/manifest
            Internal: ssh://git@gitrw.chromium.org:9222/manifest-internal
 
 manifest_version -- URL to git repo to store per-build manifest.
                     Usually None or
                     ssh://git@gitrw.chromium.org:9222/manifest-versions
 """
 
-# TODO(dgarrett) Make test_mod, factory_install_mod, factory_test_mod options
-# go away when these options work for arm.
-
 default = {
   # 'board' No default value
 
   'master' : False,
   'important' : False,
   # 'hostname' No default value
 
   'uprev' : False,
   'rev_overlays': 'public',
   'push_overlays': None,
@@ skipping 21 matching lines @@
 }
 
 arm = {
   # VM/tests are broken on arm.
   'unittests' : False,
   'vm_tests' : False,
 
   # These images don't work for arm.
   'factory_install_mod' : False,
   'factory_test_mod' : False,
+  'useflags' : None,
 }
 
 full = {
   # Full builds are test build to show that we can build from scratch,
   # so use settings to build from scratch, and archive the results.
   'usepkg' : False,
   'chroot_replace' : True,
 
   'quick_unit' : False,
   'quick_vm' : True,
@@ skipping 146 matching lines @@
 
 config['x86-generic-manifest'] = default.copy()
 config['x86-generic-manifest'].update({
   'board' : 'x86-generic',
 
   'git_url' : 'ssh://git@gitrw.chromium.org:9222/manifest-internal',
   'manifest_version' : 'ssh://git@gitrw.chromium.org:9222/manifest-versions',
 })