Test-...-Release-SK_FOO --> -DSK_FOO

tools/buildbot_spec.py

 #
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 #!/usr/bin/env python
 
 usage = '''
@@ skipping 122 matching lines @@
   # Link-time code generation just wastes time on compile-only bots.
   if (builder_dict.get('role') == builder_name_schema.BUILDER_ROLE_BUILD and
       builder_dict.get('compiler') == 'MSVC'):
     gyp_defs['skia_win_ltcg'] = '0'
 
   # Mesa.
   if (builder_dict.get('extra_config') == 'Mesa' or
       builder_dict.get('cpu_or_gpu_value') == 'Mesa'):
     gyp_defs['skia_mesa'] = '1'
 
-  # SKNX_NO_SIMD
-  if builder_dict.get('extra_config') == 'SKNX_NO_SIMD':
-    gyp_defs['sknx_no_simd'] = '1'
-
   # skia_use_android_framework_defines.
   if builder_dict.get('extra_config') == 'Android_FrameworkDefs':
     gyp_defs['skia_use_android_framework_defines'] = '1'
 
   return gyp_defs
 
 
 cov_skip.extend([lineno(), lineno() + 1])
 def get_extra_env_vars(builder_dict):
   env = {}
   if builder_dict.get('configuration') == 'Coverage':
     # We have to use Clang 3.6 because earlier versions do not support the
     # compile flags we use and 3.7 and 3.8 hit asserts during compilation.
     env['CC'] = '/usr/bin/clang-3.6'
     env['CXX'] = '/usr/bin/clang++-3.6'
   elif builder_dict.get('compiler') == 'Clang':
     env['CC'] = '/usr/bin/clang'
     env['CXX'] = '/usr/bin/clang++'
 
+  # SKNX_NO_SIMD, SK_USE_DISCARDABLE_SCALEDIMAGECACHE, etc.
+  extra_config = builder_dict.get('extra_config', '')
+  if extra_config.startswith('SK') and extra_config.isupper():
+    env['CPPFLAGS'] = '-D' + extra_config
+
   return env
 
 
 cov_skip.extend([lineno(), lineno() + 1])
 def build_targets_from_builder_dict(builder_dict):
   """Return a list of targets to build, depending on the builder type."""
   if builder_dict['role'] in ('Test', 'Perf') and builder_dict['os'] == 'iOS':
     return ['iOSShell']
   elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_TEST:
     t = ['dm']
@@ skipping 164 matching lines @@
   if len(sys.argv) == 2 and sys.argv[1] == 'test':
     self_test()
     sys.exit(0)
 
   if len(sys.argv) != 3:
     print usage
     sys.exit(1)
 
   with open(sys.argv[1], 'w') as out:
     json.dump(get_builder_spec(sys.argv[2]), out)