Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: scripts/slave/recipe_modules/chromium/config.py

Issue 2412033002: libyuv: Switch bots over to GN by default. (Closed)
Patch Set: Add WebRTC expectation changes Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipe_modules/chromium/config.py
diff --git a/scripts/slave/recipe_modules/chromium/config.py b/scripts/slave/recipe_modules/chromium/config.py
index 376eebd7c3b60904b5f174b66dcb1c2abdd5f63e..a8b6d45c1884f09e5550ccbcb4a74491339f57c6 100644
--- a/scripts/slave/recipe_modules/chromium/config.py
+++ b/scripts/slave/recipe_modules/chromium/config.py
@@ -241,10 +241,12 @@ def msvs2012(c):
@config_ctx()
def msvs2013(c):
+ c.gn_args.append('visual_studio_version=2013')
c.gyp_env.GYP_MSVS_VERSION = '2013'
@config_ctx()
def msvs2015(c):
+ c.gn_args.append('visual_studio_version=2015')
c.gyp_env.GYP_MSVS_VERSION = '2015'
@config_ctx()
@@ -279,6 +281,7 @@ def xcode(c): # pragma: no cover
def _clang_common(c):
c.compile_py.compiler = 'clang'
+ c.gn_args.append('is_clang=true')
c.gyp_env.GYP_DEFINES['clang'] = 1
@config_ctx(group='compiler')
@@ -287,6 +290,7 @@ def clang(c):
@config_ctx(group='compiler')
def gcc(c):
+ c.gn_args.append('is_clang=false')
c.gyp_env.GYP_DEFINES['clang'] = 0
@config_ctx(group='compiler')
@@ -308,10 +312,12 @@ def goma(c):
@config_ctx()
def dcheck(c, invert=False):
+ c.gn_args.append('dcheck_always_on=%s' % str(not invert).lower())
c.gyp_env.GYP_DEFINES['dcheck_always_on'] = int(not invert)
@config_ctx()
def fastbuild(c, invert=False):
+ c.gn_args.append('symbol_level=%d' % (1 if invert else 2))
c.gyp_env.GYP_DEFINES['fastbuild'] = int(not invert)
@config_ctx()
@@ -324,10 +330,12 @@ def isolation_mode_noop(c):
@config_ctx(group='link_type')
def shared_library(c):
+ c.gn_args.append('is_component=true')
ehmaldonado_chromium 2016/10/12 13:59:30 Shouldn't it be is_component_build?
kjellander_chromium 2016/10/13 00:52:45 Good catch! You're right.
c.gyp_env.GYP_DEFINES['component'] = 'shared_library'
@config_ctx(group='link_type')
def static_library(c):
+ c.gn_args.append('is_component=false')
c.gyp_env.GYP_DEFINES['component'] = 'static_library'
@config_ctx()
@@ -381,9 +389,11 @@ def asan(c):
# Set fastbuild=0 and prevent other configs from changing it.
fastbuild(c, invert=True, optional=False)
+ c.gn_args.append('is_asan=true')
c.gyp_env.GYP_DEFINES['asan'] = 1
if c.TARGET_PLATFORM != 'android' and c.TARGET_BITS == 64:
# LSAN isn't supported on Android or 32 bits platforms.
+ c.gn_args.append('is_lsan=true')
c.gyp_env.GYP_DEFINES['lsan'] = 1
@config_ctx(deps=['compiler'])
@@ -409,6 +419,7 @@ def msan(c):
if 'clang' not in c.compile_py.compiler: # pragma: no cover
raise BadConf('msan requires clang')
c.runtests.swarming_tags |= {'msan:1'}
+ c.gn_args.append('is_msan=true')
c.gyp_env.GYP_DEFINES['msan'] = 1
@config_ctx()
@@ -434,12 +445,14 @@ def ubsan_fail_on_errors(c):
def ubsan(c):
if 'clang' not in c.compile_py.compiler: # pragma: no cover
raise BadConf('ubsan requires clang')
+ c.gn_args.append('is_ubsan=true')
c.gyp_env.GYP_DEFINES['ubsan'] = 1
@config_ctx(deps=['compiler'], includes=['ubsan_fail_on_errors'])
def ubsan_vptr(c):
if 'clang' not in c.compile_py.compiler: # pragma: no cover
raise BadConf('ubsan_vptr requires clang')
+ c.gn_args.append('is_ubsan_vptr=true')
c.gyp_env.GYP_DEFINES['ubsan_vptr'] = 1
@config_ctx()
@@ -456,6 +469,7 @@ def tsan2(c):
if 'clang' not in c.compile_py.compiler: # pragma: no cover
raise BadConf('tsan2 requires clang')
c.runtests.swarming_tags |= {'tsan:1'}
+ c.gn_args.append('is_tsan=true')
ehmaldonado_chromium 2016/10/12 13:59:30 Isn't there anything similar to disable_nacl in GN
kjellander_chromium 2016/10/13 00:52:45 Good reviewing, looking up how things work. In thi
gyp_defs = c.gyp_env.GYP_DEFINES
gyp_defs['tsan'] = 1
gyp_defs['disable_nacl'] = 1
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/libyuv/api.py » ('j') | scripts/slave/recipe_modules/libyuv/builders.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698