Commit 9ceff715 authored by Jamie Madill's avatar Jamie Madill Committed by LUCI CQ

Revert "Remove ANGLE recipe config."

This reverts commit b8686d26.

Reason for revert: Breaks presubmit bot.
https://ci.chromium.org/ui/p/angle/builders/try/presubmit/20928/overview

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: Ifcf762d5a9e2c57a2ac5963b765042534bc9769f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2830370
Auto-Submit: Jamie Madill <jmadill@chromium.org>
Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
Reviewed-by: 's avatarMarc-Antoine Ruel <maruel@chromium.org>
Reviewed-by: 's avatarEdward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
parent 48d9e1e5
...@@ -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#53)(api):** &mdash; **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#54)(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,6 +405,19 @@ def gerrit_test_cq_normal(c): ...@@ -405,6 +405,19 @@ 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,6 +14,7 @@ DEPS = [ ...@@ -14,6 +14,7 @@ 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