Commit b8848852 authored by Jamie Madill's avatar Jamie Madill Committed by LUCI CQ

Reland "Reland "Remove ANGLE recipe config.""

This is a reland of 75271a07

Should be safe to re-land now, as the roller will catch the
build error. Then we can re-land in conjunction with the
change to rename the angle gclient config.

Original change's description:
> Reland "Remove ANGLE recipe config."
>
> This is a reland of b8686d26
> Must land after https://crrev.com/c/2831999
>
> Original change's description:
> > Remove ANGLE recipe config.
> >
> > This config is now located in the ANGLE recipe_module.
> >
> > Bug: angleproject:5114
> > Change-Id: I2c4cc51dafeb94378056c135538d0d13bac9c8cb
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2826242
> > Auto-Submit: Jamie Madill <jmadill@chromium.org>
> > Commit-Queue: Andrii Shyshkalov <tandrii@google.com>
> > Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
>
> Bug: angleproject:5114
> Change-Id: I858d50f49466707eae7194fd82713de7b0b2e6d6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2835386
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Bug: angleproject:5114
Change-Id: I85c3d6218b790ef62b19c62eb42ec9a8622d613f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2836327
Auto-Submit: Jamie Madill <jmadill@chromium.org>
Reviewed-by: 's avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
parent 980c1abc
...@@ -1008,7 +1008,7 @@ Raises: ...@@ -1008,7 +1008,7 @@ Raises:
[DEPS](/recipes/recipe_modules/gclient/examples/full.py#5): [gclient](#recipe_modules-gclient), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] [DEPS](/recipes/recipe_modules/gclient/examples/full.py#5): [gclient](#recipe_modules-gclient), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
&mdash; **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#54)(api):** &mdash; **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#53)(api):**
### *recipes* / [gclient:tests/diff\_deps](/recipes/recipe_modules/gclient/tests/diff_deps.py) ### *recipes* / [gclient:tests/diff\_deps](/recipes/recipe_modules/gclient/tests/diff_deps.py)
[DEPS](/recipes/recipe_modules/gclient/tests/diff_deps.py#7): [gclient](#recipe_modules-gclient), [recipe\_engine/assertions][recipe_engine/recipe_modules/assertions], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io] [DEPS](/recipes/recipe_modules/gclient/tests/diff_deps.py#7): [gclient](#recipe_modules-gclient), [recipe\_engine/assertions][recipe_engine/recipe_modules/assertions], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io]
......
...@@ -405,19 +405,6 @@ def gerrit_test_cq_normal(c): ...@@ -405,19 +405,6 @@ def gerrit_test_cq_normal(c):
soln.name = 'gerrit-test-cq-normal' soln.name = 'gerrit-test-cq-normal'
soln.url = 'https://chromium.googlesource.com/playground/gerrit-cq/normal.git' soln.url = 'https://chromium.googlesource.com/playground/gerrit-cq/normal.git'
@config_ctx()
def angle(c):
soln = c.solutions.add()
soln.name = 'angle'
soln.url = 'https://chromium.googlesource.com/angle/angle.git'
# Standalone developer angle builds want the angle checkout in the same
# directory the .gclient file is in. Bots want it in a directory called
# 'angle'. To make both cases work, the angle DEPS file pulls deps and runs
# hooks relative to the variable "root" which is set to . by default and
# then to 'angle' in the recipes here:
soln.custom_vars = {'angle_root': 'angle'}
c.got_revision_mapping['angle'] = 'got_revision'
@config_ctx() @config_ctx()
def dawn(c): def dawn(c):
soln = c.solutions.add() soln = c.solutions.add()
......
...@@ -14,7 +14,6 @@ DEPS = [ ...@@ -14,7 +14,6 @@ DEPS = [
TEST_CONFIGS = [ TEST_CONFIGS = [
'android', 'android',
'angle',
'boringssl', 'boringssl',
'build_internal', 'build_internal',
'build_internal_scripts_slave', 'build_internal_scripts_slave',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment