From 7a0ff2f700f81dfe2e5fac2d53b01a4c8f413f81 Mon Sep 17 00:00:00 2001 From: ehmaldonado Date: Wed, 24 Aug 2016 06:09:17 -0700 Subject: [PATCH] Disable examples for GYP Android bots. When rolling Chromium into WebRTC, these fail to compile since chromium no longer supports GYP. BUG=webrtc:6252 NOTRY=True Review-Url: https://codereview.webrtc.org/2275973003 Cr-Commit-Position: refs/heads/master@{#13892} --- webrtc/build/mb_config.pyl | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl index d09d5d2c4b..6a69d077d6 100644 --- a/webrtc/build/mb_config.pyl +++ b/webrtc/build/mb_config.pyl @@ -279,10 +279,12 @@ # Android 'android_gyp_debug_static_bot_arm': [ - 'android', 'gyp', 'debug_static_bot', 'arm', 'exclude_tests' + 'android', 'gyp', 'debug_static_bot', 'arm', 'exclude_tests', + 'exclude_examples' ], 'android_gyp_release_bot_arm': [ - 'android', 'gyp', 'release_bot', 'arm', 'exclude_tests' + 'android', 'gyp', 'release_bot', 'arm', 'exclude_tests', + 'exclude_examples' ], 'android_gn_debug_static_bot_arm': [ 'android', 'gn', 'debug_static_bot', 'arm' @@ -382,11 +384,6 @@ 'gyp_defines': 'component=shared_library build_for_tool=drmemory', }, - 'exclude_tests': { - 'gn_args': 'rtc_include_tests=false', - 'gyp_defines': 'include_tests=0', - }, - # This mixin is used to force configs that use it to fail. It # is used in two cases: when we have bots that we haven't looked # at yet and don't know whether they need MB or not, and for bots @@ -396,6 +393,15 @@ 'gyp_defines': 'target_arch=unknown', }, + 'exclude_examples': { + 'gyp_defines': 'include_examples=0', + }, + + 'exclude_tests': { + 'gn_args': 'rtc_include_tests=false', + 'gyp_defines': 'include_tests=0', + }, + 'gn': {'type': 'gn'}, 'goma': {