From ea240053f95686277bd86700d7a1209dc09474f4 Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Thu, 3 May 2018 19:57:17 -0400 Subject: [PATCH] gclient: Update catapult and custom-tab-client origin URLs Otherwise, the origin URLs for the checkout and the patch won't match and applying the patch on gclient will fail. Bug: 643346 Change-Id: If005bb10e579b3d50f9b6d0ff39440bb9a300cbd Recipe-Nontrivial-Roll: build Recipe-Nontrivial-Roll: build_limited Recipe-Nontrivial-Roll: build_limited_scripts_slave Reviewed-on: https://chromium-review.googlesource.com/1043254 Commit-Queue: Edward Lesmes Reviewed-by: Aaron Gable --- recipes/recipe_modules/gclient/config.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/recipe_modules/gclient/config.py b/recipes/recipe_modules/gclient/config.py index 8ad82f94b8..3f28b13c1c 100644 --- a/recipes/recipe_modules/gclient/config.py +++ b/recipes/recipe_modules/gclient/config.py @@ -359,8 +359,7 @@ def recipes_py_bare(c): def catapult(c): soln = c.solutions.add() soln.name = 'catapult' - soln.url = ('https://chromium.googlesource.com/external/github.com/' - 'catapult-project/catapult.git') + soln.url = 'https://chromium.googlesource.com/catapult' c.got_revision_mapping['catapult'] = 'got_revision' @config_ctx(includes=['infra_internal']) @@ -385,8 +384,7 @@ def custom_tabs_client(c): soln = c.solutions.add() soln.name = 'custom_tabs_client' # TODO(pasko): test custom-tabs-client within a full chromium checkout. - soln.url = ('https://chromium.googlesource.com/external/github.com/' - 'GoogleChrome/custom-tabs-client.git') + soln.url = 'https://chromium.googlesource.com/custom-tabs-client' c.got_revision_mapping['custom_tabs_client'] = 'got_revision' @config_ctx()