diff options
Diffstat (limited to 'infra/bots/recipe_modules/checkout/api.py')
| -rw-r--r-- | infra/bots/recipe_modules/checkout/api.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/infra/bots/recipe_modules/checkout/api.py b/infra/bots/recipe_modules/checkout/api.py index f520c5b0a3..f2f6560734 100644 --- a/infra/bots/recipe_modules/checkout/api.py +++ b/infra/bots/recipe_modules/checkout/api.py @@ -71,17 +71,7 @@ class CheckoutApi(recipe_api.RecipeApi): # Initial cleanup. gclient_cfg = self.m.gclient.make_config(**cfg_kwargs) - # Add chromium first because of skbug.com/7917. - if checkout_chromium: - chromium = gclient_cfg.solutions.add() - chromium.name = 'src' - chromium.managed = False - chromium.url = 'https://chromium.googlesource.com/chromium/src.git' - chromium.revision = 'origin/master' - extra_gclient_env['GYP_CHROMIUM_NO_ACTION'] = '0' - main_repo = self.m.properties['repository'] - if checkout_flutter: main_repo = 'https://github.com/flutter/engine.git' main_name = self.m.path.basename(main_repo) @@ -122,6 +112,10 @@ class CheckoutApi(recipe_api.RecipeApi): patch_repo = 'https://skia.googlesource.com/skia.git' patch_root = skia_dep_path + if checkout_chromium: + main.custom_vars['checkout_chromium'] = True + extra_gclient_env['GYP_CHROMIUM_NO_ACTION'] = '0' + # TODO(rmistry): Remove the below block after there is a solution for # crbug.com/616443 entries_file = checkout_root.join('.gclient_entries') |