Refactor ANGLE's DEPS configuration using gclient conditionals |
|||
Issue descriptionFor our work flow, we have two sets of deps and hooks, currently maintained in two DEPS files. One is for standalone builds, outside of chromium, and the other is for when ANGLE is itself a dependency of Chrome. <links might break if the code changes> https://cs.chromium.org/chromium/src/third_party/angle/DEPS https://cs.chromium.org/chromium/src/third_party/angle/DEPS.chromium https://cs.chromium.org/chromium/src/DEPS?l=1295 We distinguish our standalone vs Chromium cases in GN files by checking 'build_with_chromium' in build_overrides/build.gni. In ANGLE standalone, this is false. With gclient, we maintain the two sets of similar files. Dirk can you help with this? I'm not sure which of ANGLE's configurations could be considered the 'main' configuration since they're both equally used. Would one lead to a more simple config?
,
Apr 25 2018
I don't think there's a built-in way. You could check for one of the vars only defined in chromium's DEPS but that seems hacky :-) Setting a var in angle's DEPS and then checking that seems like it should work (but I'm not sure how recursive DEPS play with that).
,
Apr 25 2018
Well, the idea is we'd switch from pulling in ANGLE's DEPS.chromium to pulling in ANGLE's DEPS file and using conditions. If I define a variable in ANGLE's DEPS file then, not sure if the variable would know if it's in a recursedeps call or not.
,
Apr 25 2018
The following revision refers to this bug: https://chromium.googlesource.com/angle/angle/+/f3135da9d52f6e6f1e561e8138e97902edf0ebfb commit f3135da9d52f6e6f1e561e8138e97902edf0ebfb Author: Jamie Madill <jmadill@chromium.org> Date: Wed Apr 25 13:44:42 2018 Clean up DEPS style. Conforms a bit more to the proposed DEPS standardization. Bug: chromium:782846 Change-Id: I65eae268dc9ebe4a56382db67fd123a0beafa656 Reviewed-on: https://chromium-review.googlesource.com/1027792 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> [modify] https://crrev.com/f3135da9d52f6e6f1e561e8138e97902edf0ebfb/DEPS
,
Apr 25 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/d93a64651183f6f6117b442ea2aea74aab3e32cc commit d93a64651183f6f6117b442ea2aea74aab3e32cc Author: angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Date: Wed Apr 25 22:41:26 2018 Roll src/third_party/angle/ 10434f676..23dc90b81 (5 commits) https://chromium.googlesource.com/angle/angle.git/+log/10434f67672d..23dc90b81efb $ git log 10434f676..23dc90b81 --date=short --no-merges --format='%ad %ae %s' 2018-04-23 lfy GLES1: Enable/disable for texture targets 2018-04-25 oetuaho Handle negative float to uint conversion robustly 2018-04-24 lucferron Vulkan: Enable UnpackAlignmentTest and remove useless warning. 2018-04-24 lucferron Vulkan: Fix issue with texsubimage2d barriers 2018-04-25 jmadill Clean up DEPS style. Created with: roll-dep src/third_party/angle BUG= chromium:835868 , chromium:782846 The AutoRoll server is located here: https://angle-chromium-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel TBR=geofflang@chromium.org Change-Id: I7ff0b0ad560ed9fadcce00db4c136232330826c9 Reviewed-on: https://chromium-review.googlesource.com/1028521 Commit-Queue: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#553799} [modify] https://crrev.com/d93a64651183f6f6117b442ea2aea74aab3e32cc/DEPS
,
May 23 2018
I don't know if or when I'm likely to get to this. ehmaldonaldo@ - can you take this over?
,
May 23 2018
Yeah. So what are the differences between DEPS.chromium and DEPS?
,
May 23 2018
DEPS.chromium is the file used when ANGLE is part of a chromium build; DEPS is the file used when ANGLE is built w/o chromium (standalone).
,
May 23 2018
I was trying to think of a way to do this without affecting the ANGLE devs' workflow. Is there any boolean or flag we can check in ANGLE's DEPS that would tell us if we're in a Chromium checkout or an ANGLE standalone checkout?
,
May 23 2018
Or if not, would it be objectionable to add this flag to the Chromium DEPS?
,
May 23 2018
I believe "condition": "root == '.'" should work...
,
May 23 2018
Is that in reference to the vars at the top? Don't those get pulled in by recursedeps? In any case unfortunately on the ANGLE standalone bots that's overridden because of issues with gclient.
,
May 23 2018
There is no 'root' var in Chromium, at the moment, but there is one in ANGLE. You could rename it to 'angle_root', then Chromium could define 'angle_root' to be 'third_party/angle', and you could tell whether you're in Chromium or ANGLE that way. What issues with gclient?
,
May 23 2018
We override 'root' to be 'src' on the standalone bots because gclient currently won't accept '.' as a directory. Defining a variable in Chromium's DEPS sounds fine though. Maybe you could use != instead of ==.
,
May 23 2018
Renaming to angle_root also sounds good. You'd have to modify the recipe here:: https://chromium.googlesource.com/chromium/tools/build/+/master/scripts/slave/recipes/angle.py#31 Preferably done in a way to gracefully not break the build.
,
May 23 2018
In the GN files, there's a 'build_with_chromium' arg that gets defined in //build_overrides/build.gni. One possibility would be to move that to a gclient var that was written out in the gclient_args_file.
,
May 23 2018
That SGTM Dirk, if that works.
,
May 31 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/88678b826028a2c25f98fbdcd290bbd98e87af05 commit 88678b826028a2c25f98fbdcd290bbd98e87af05 Author: Edward Lemur <ehmaldonado@chromium.org> Date: Thu May 31 06:01:38 2018 Move build_with_chromium GN variable to DEPS file. This way, DEPS files can also know whether they're building with chromium or not. Bug: 782846 Change-Id: I43885e2b9aa1e72b612c17569a23d47e74835273 Reviewed-on: https://chromium-review.googlesource.com/1077619 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Dirk Pranke <dpranke@chromium.org> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> Cr-Commit-Position: refs/heads/master@{#563160} [modify] https://crrev.com/88678b826028a2c25f98fbdcd290bbd98e87af05/DEPS [modify] https://crrev.com/88678b826028a2c25f98fbdcd290bbd98e87af05/build_overrides/build.gni
,
Jun 1 2018
The following revision refers to this bug: https://chromium.googlesource.com/angle/angle/+/cbab27508edf116d73535f4cebf0dfb21d187c84 commit cbab27508edf116d73535f4cebf0dfb21d187c84 Author: Edward Lemur <ehmaldonado@chromium.org> Date: Fri Jun 01 01:36:49 2018 DEPS.chromium: Sync dEQP to ANGLE (not Chromium) third_party. Bug: 782846 Change-Id: I88af578dfd27fb69751138d9b263a148da9ecf23 Reviewed-on: https://chromium-review.googlesource.com/1081113 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org> [modify] https://crrev.com/cbab27508edf116d73535f4cebf0dfb21d187c84/src/tests/BUILD.gn [modify] https://crrev.com/cbab27508edf116d73535f4cebf0dfb21d187c84/DEPS.chromium [modify] https://crrev.com/cbab27508edf116d73535f4cebf0dfb21d187c84/src/tests/deqp_support/angle_deqp_gtest.cpp [modify] https://crrev.com/cbab27508edf116d73535f4cebf0dfb21d187c84/src/tests/deqp_support/angle_deqp_libtester_main.cpp
,
Jun 1 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/e7b17bdf651b14953109fcc60e86bcdd0ea8939b commit e7b17bdf651b14953109fcc60e86bcdd0ea8939b Author: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Date: Fri Jun 01 04:57:02 2018 Roll src/third_party/angle 46bcea5..cbab275 (5 commits) https://chromium.googlesource.com/angle/angle.git/+log/46bcea5..cbab275 git log 46bcea5..cbab275 --date=short --no-merges --format='%ad %ae %s' 2018-05-31 ehmaldonado@chromium.org DEPS.chromium: Sync dEQP to ANGLE (not Chromium) third_party. 2018-05-30 lfy@google.com GLES1: Shade model API 2018-05-30 lfy@google.com GLES1: Alpha test 2018-05-08 jiawei.shao@intel.com Use ShaderMap in Caps - Part II 2018-05-31 jiawei.shao@intel.com Use IsCubeMapFaceTarget on texture targets Created with: gclient setdep -r src/third_party/angle@cbab275 The AutoRoll server is located here: https://angle-chromium-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel BUG= chromium:782846 TBR=jmadill@chromium.org Change-Id: I68255010de63df94a794256de76ab0433d2e6d8e Reviewed-on: https://chromium-review.googlesource.com/1081948 Commit-Queue: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#563538} [modify] https://crrev.com/e7b17bdf651b14953109fcc60e86bcdd0ea8939b/DEPS
,
Jun 1 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/build/+/f940002d742d437f4bd146071b445073db461c97 commit f940002d742d437f4bd146071b445073db461c97 Author: Edward Lemur <ehmaldonado@chromium.org> Date: Fri Jun 01 18:38:19 2018 angle: Set custom angle_root variable. The root variable is being renamed to angle_root in ANGLE's DEPS file. Bug: 782846 Change-Id: Ice8dfb95ab05cdd560884678d1e927c717ebedc4 Reviewed-on: https://chromium-review.googlesource.com/1082920 Reviewed-by: Aaron Gable <agable@chromium.org> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> [modify] https://crrev.com/f940002d742d437f4bd146071b445073db461c97/scripts/slave/recipes/angle.expected/win_rel_msvc_x86.json [modify] https://crrev.com/f940002d742d437f4bd146071b445073db461c97/scripts/slave/recipes/angle.py [modify] https://crrev.com/f940002d742d437f4bd146071b445073db461c97/scripts/slave/recipes/angle.expected/win.json [modify] https://crrev.com/f940002d742d437f4bd146071b445073db461c97/scripts/slave/recipes/angle.expected/linux_gcc.json [modify] https://crrev.com/f940002d742d437f4bd146071b445073db461c97/scripts/slave/README.recipes.md [modify] https://crrev.com/f940002d742d437f4bd146071b445073db461c97/scripts/slave/recipes/angle.expected/win_clang.json [modify] https://crrev.com/f940002d742d437f4bd146071b445073db461c97/scripts/slave/recipes/angle.expected/linux.json
,
Jun 1 2018
The following revision refers to this bug: https://chromium.googlesource.com/angle/angle/+/8ae09b0e2f3a5f82b37c47b95ea68adf54977454 commit 8ae09b0e2f3a5f82b37c47b95ea68adf54977454 Author: Edward Lemur <ehmaldonado@chromium.org> Date: Fri Jun 01 20:36:46 2018 Make DEPS file compatible with Chromium. Rename 'root' to 'angle_root' and add conditions to not sync dependencies when building with Chromium. Bug: 782846 Change-Id: I250609ad0b5b8cad606075baf6dd6ca4e968a5b6 Reviewed-on: https://chromium-review.googlesource.com/1082922 Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> [modify] https://crrev.com/8ae09b0e2f3a5f82b37c47b95ea68adf54977454/DEPS
,
Jun 1 2018
The following revision refers to this bug: https://chromium.googlesource.com/angle/angle/+/47463d85411613640dfaae2226d7dbaff233cd70 commit 47463d85411613640dfaae2226d7dbaff233cd70 Author: Edward Lemur <ehmaldonado@chromium.org> Date: Fri Jun 01 22:25:27 2018 Use revision variables in DEPS. Bug: 782846 Change-Id: I915b8e97d6420019051b3fa77ae843a4942e7802 Reviewed-on: https://chromium-review.googlesource.com/1083316 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> [modify] https://crrev.com/47463d85411613640dfaae2226d7dbaff233cd70/DEPS
,
Jun 1 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/72f1b5f29d67adf7130c06767b8718dd072351c4 commit 72f1b5f29d67adf7130c06767b8718dd072351c4 Author: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Date: Fri Jun 01 22:43:28 2018 Roll src/third_party/angle bf7b95d..2f3f414 (4 commits) https://chromium.googlesource.com/angle/angle.git/+log/bf7b95d..2f3f414 git log bf7b95d..2f3f414 --date=short --no-merges --format='%ad %ae %s' 2018-06-01 lucferron@chromium.org Vulkan: Fix texture completeness issues 2018-06-01 ehmaldonado@chromium.org Make DEPS file compatible with Chromium. 2018-06-01 jmadill@chromium.org D3D11: Micro-optimize StateManager11::updateState. 2018-06-01 jmadill@chromium.org D3D11: Optimize Renderer11::drawArrays. Created with: gclient setdep -r src/third_party/angle@2f3f414 The AutoRoll server is located here: https://angle-chromium-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel BUG= chromium:782846 TBR=jmadill@chromium.org Change-Id: Ie6ffe9dec90ea76d7edd35701dff9e1977745355 Reviewed-on: https://chromium-review.googlesource.com/1083336 Reviewed-by: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#563840} [modify] https://crrev.com/72f1b5f29d67adf7130c06767b8718dd072351c4/DEPS
,
Jun 2 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/22d12bbb22b7087572590184c36c1906130e762c commit 22d12bbb22b7087572590184c36c1906130e762c Author: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Date: Sat Jun 02 01:06:11 2018 Roll src/third_party/angle 2f3f414..47463d8 (2 commits) https://chromium.googlesource.com/angle/angle.git/+log/2f3f414..47463d8 git log 2f3f414..47463d8 --date=short --no-merges --format='%ad %ae %s' 2018-06-01 ehmaldonado@chromium.org Use revision variables in DEPS. 2018-06-01 geofflang@chromium.org Move the EGL-based initial state to the gl::State constructor. Created with: gclient setdep -r src/third_party/angle@47463d8 The AutoRoll server is located here: https://angle-chromium-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel BUG= chromium:782846 TBR=jmadill@chromium.org Change-Id: I8dee9778ff65d558f81f900cbd915ed84b15bc11 Reviewed-on: https://chromium-review.googlesource.com/1083881 Reviewed-by: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#563894} [modify] https://crrev.com/22d12bbb22b7087572590184c36c1906130e762c/DEPS
,
Jun 2 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/628b2c85357306dbf390faebd0d0768f3eeba293 commit 628b2c85357306dbf390faebd0d0768f3eeba293 Author: Edward Lemur <ehmaldonado@chromium.org> Date: Sat Jun 02 01:23:38 2018 Use DEPS instead of DEPS.chromium to recurse into ANGLE. ANGLE's DEPS file knows now what to sync when building with Chromium. Introduce the 'angle_root' variable that we need to tell ANGLE to sync in third_party/angle. Bug: 782846 Change-Id: I26c5f48b7e4bc5a3f435d3de64d99bccb49a9555 Reviewed-on: https://chromium-review.googlesource.com/1083229 Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Cr-Commit-Position: refs/heads/master@{#563898} [modify] https://crrev.com/628b2c85357306dbf390faebd0d0768f3eeba293/DEPS
,
Jun 2 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/0215d034281493f13def1e4ee36486b1acce4130 commit 0215d034281493f13def1e4ee36486b1acce4130 Author: Michael Moss <mmoss@chromium.org> Date: Sat Jun 02 04:13:56 2018 Revert "Use DEPS instead of DEPS.chromium to recurse into ANGLE." This reverts commit 628b2c85357306dbf390faebd0d0768f3eeba293. Reason for revert: Breaking 'gclient flattening' in release scripts. Original change's description: > Use DEPS instead of DEPS.chromium to recurse into ANGLE. > > ANGLE's DEPS file knows now what to sync when building with Chromium. > > Introduce the 'angle_root' variable that we need to tell ANGLE to sync > in third_party/angle. > > Bug: 782846 > Change-Id: I26c5f48b7e4bc5a3f435d3de64d99bccb49a9555 > Reviewed-on: https://chromium-review.googlesource.com/1083229 > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Cr-Commit-Position: refs/heads/master@{#563898} TBR=dpranke@chromium.org,jmadill@chromium.org,ehmaldonado@chromium.org Change-Id: I478feb786ebbd574a9713f0c8e19a5efc13769e8 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 782846 , 848990 Reviewed-on: https://chromium-review.googlesource.com/1084013 Reviewed-by: Michael Moss <mmoss@chromium.org> Commit-Queue: Michael Moss <mmoss@chromium.org> Cr-Commit-Position: refs/heads/master@{#563927} [modify] https://crrev.com/0215d034281493f13def1e4ee36486b1acce4130/DEPS
,
Jun 4 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/build/+/7d066dd6eac24ac19a1fb1c4f1bc7dd432d433c0 commit 7d066dd6eac24ac19a1fb1c4f1bc7dd432d433c0 Author: Edward Lemur <ehmaldonado@chromium.org> Date: Mon Jun 04 22:36:15 2018 angle: Remove root variable. It has been renamed to angle_root in ANGLE's DEPS file. Bug: 782846 Change-Id: I91edf4069d451e904123b8767eb3d7994e29304f Reviewed-on: https://chromium-review.googlesource.com/1084051 Reviewed-by: Aaron Gable <agable@chromium.org> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> [modify] https://crrev.com/7d066dd6eac24ac19a1fb1c4f1bc7dd432d433c0/scripts/slave/recipes/angle.expected/win_rel_msvc_x86.json [modify] https://crrev.com/7d066dd6eac24ac19a1fb1c4f1bc7dd432d433c0/scripts/slave/recipes/angle.py [modify] https://crrev.com/7d066dd6eac24ac19a1fb1c4f1bc7dd432d433c0/scripts/slave/recipes/angle.expected/win.json [modify] https://crrev.com/7d066dd6eac24ac19a1fb1c4f1bc7dd432d433c0/scripts/slave/recipes/angle.expected/linux_gcc.json [modify] https://crrev.com/7d066dd6eac24ac19a1fb1c4f1bc7dd432d433c0/scripts/slave/README.recipes.md [modify] https://crrev.com/7d066dd6eac24ac19a1fb1c4f1bc7dd432d433c0/scripts/slave/recipes/angle.expected/win_clang.json [modify] https://crrev.com/7d066dd6eac24ac19a1fb1c4f1bc7dd432d433c0/scripts/slave/recipes/angle.expected/linux.json
,
Jun 11 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/d307b4d2064cfe8c3a0420fe3545c22ed1460d57 commit d307b4d2064cfe8c3a0420fe3545c22ed1460d57 Author: Edward Lemur <ehmaldonado@chromium.org> Date: Mon Jun 11 20:52:48 2018 Reland "Use DEPS instead of DEPS.chromium to recurse into ANGLE." This is a reland of 628b2c85357306dbf390faebd0d0768f3eeba293 gclient has been fixed to support vars in recursedeps, which is used by ANGLE's DEPS file. Original change's description: > Use DEPS instead of DEPS.chromium to recurse into ANGLE. > > ANGLE's DEPS file knows now what to sync when building with Chromium. > > Introduce the 'angle_root' variable that we need to tell ANGLE to sync > in third_party/angle. > > Bug: 782846 > Change-Id: I26c5f48b7e4bc5a3f435d3de64d99bccb49a9555 > Reviewed-on: https://chromium-review.googlesource.com/1083229 > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Cr-Commit-Position: refs/heads/master@{#563898} Bug: 782846 Change-Id: I72570f4a8a8f430e69dade68c0fb61d0dbb32333 Reviewed-on: https://chromium-review.googlesource.com/1095542 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> Cr-Commit-Position: refs/heads/master@{#566139} [modify] https://crrev.com/d307b4d2064cfe8c3a0420fe3545c22ed1460d57/DEPS
,
Jun 12 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/e1017260ce7c6b300fb3f28be44e34ea03c71efe commit e1017260ce7c6b300fb3f28be44e34ea03c71efe Author: Michael Moss <mmoss@chromium.org> Date: Tue Jun 12 04:11:52 2018 Revert "Reland "Use DEPS instead of DEPS.chromium to recurse into ANGLE."" This reverts commit d307b4d2064cfe8c3a0420fe3545c22ed1460d57. Reason for revert: Looks like this is causing the release scripts (gclient flatten) to fail again, with the same "KeyError: '{angle_root}/buildtools'" error. Original change's description: > Reland "Use DEPS instead of DEPS.chromium to recurse into ANGLE." > > This is a reland of 628b2c85357306dbf390faebd0d0768f3eeba293 > > gclient has been fixed to support vars in recursedeps, which is used > by ANGLE's DEPS file. > > Original change's description: > > Use DEPS instead of DEPS.chromium to recurse into ANGLE. > > > > ANGLE's DEPS file knows now what to sync when building with Chromium. > > > > Introduce the 'angle_root' variable that we need to tell ANGLE to sync > > in third_party/angle. > > > > Bug: 782846 > > Change-Id: I26c5f48b7e4bc5a3f435d3de64d99bccb49a9555 > > Reviewed-on: https://chromium-review.googlesource.com/1083229 > > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> > > Reviewed-by: Jamie Madill <jmadill@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#563898} > > Bug: 782846 > Change-Id: I72570f4a8a8f430e69dade68c0fb61d0dbb32333 > Reviewed-on: https://chromium-review.googlesource.com/1095542 > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> > Cr-Commit-Position: refs/heads/master@{#566139} TBR=dpranke@chromium.org,jmadill@chromium.org,ehmaldonado@chromium.org Change-Id: I2b4f55ced7cbf4f1b642211cfa9033fe9343ddf6 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 782846 Reviewed-on: https://chromium-review.googlesource.com/1096694 Reviewed-by: Michael Moss <mmoss@chromium.org> Commit-Queue: Michael Moss <mmoss@chromium.org> Cr-Commit-Position: refs/heads/master@{#566294} [modify] https://crrev.com/e1017260ce7c6b300fb3f28be44e34ea03c71efe/DEPS
,
Jun 13 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/8e0b906b62158c569ea53868018faab01a136d6a commit 8e0b906b62158c569ea53868018faab01a136d6a Author: Edward Lemur <ehmaldonado@chromium.org> Date: Wed Jun 13 21:36:26 2018 Reland "Use DEPS instead of DEPS.chromium to recurse into ANGLE." This is a reland of 628b2c85357306dbf390faebd0d0768f3eeba293 The revision of depot_tools was updated for internal recipes. Original change's description: > Use DEPS instead of DEPS.chromium to recurse into ANGLE. > > ANGLE's DEPS file knows now what to sync when building with Chromium. > > Introduce the 'angle_root' variable that we need to tell ANGLE to sync > in third_party/angle. > > Bug: 782846 > Change-Id: I26c5f48b7e4bc5a3f435d3de64d99bccb49a9555 > Reviewed-on: https://chromium-review.googlesource.com/1083229 > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Cr-Commit-Position: refs/heads/master@{#563898} Bug: 782846 Change-Id: Ie0bfc5e83177944246e26fb788a341e54b784adb Reviewed-on: https://chromium-review.googlesource.com/1099435 Reviewed-by: Michael Moss <mmoss@chromium.org> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> Cr-Commit-Position: refs/heads/master@{#566991} [modify] https://crrev.com/8e0b906b62158c569ea53868018faab01a136d6a/DEPS
,
Jun 18 2018
The following revision refers to this bug: https://chromium.googlesource.com/angle/angle/+/9d69dd96ab6b299122176b48d5a43ce7609206e0 commit 9d69dd96ab6b299122176b48d5a43ce7609206e0 Author: Edward Lemur <ehmaldonado@chromium.org> Date: Mon Jun 18 21:50:18 2018 Remove DEPS .chromium Chromium now uses the same DEPS file as ANGLE. Bug: 782846 Change-Id: I717abeabfa15398a27740ab02e42def7cdb8ffac Reviewed-on: https://chromium-review.googlesource.com/1083786 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> [delete] https://crrev.com/388f991ce84058e5a44208e182d9b6d5ffbaf9b5/DEPS.chromium
,
Jun 19 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/e50f482d73515a178ec1ed954d6082410808b53f commit e50f482d73515a178ec1ed954d6082410808b53f Author: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Date: Tue Jun 19 02:05:12 2018 Roll src/third_party/angle f5557accff71..2dabb4a367c3 (3 commits) https://chromium.googlesource.com/angle/angle.git/+log/f5557accff71..2dabb4a367c3 git log f5557accff71..2dabb4a367c3 --date=short --no-merges --format='%ad %ae %s' 2018-06-18 geofflang@chromium.org Make a context current when destroying it. 2018-06-18 ehmaldonado@chromium.org Remove DEPS .chromium 2018-06-18 fjhenigman@chromium.org Vulkan: fix third_party path. Created with: gclient setdep -r src/third_party/angle@2dabb4a367c3 The AutoRoll server is located here: https://angle-chromium-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel BUG= chromium:782846 TBR=cwallez@chromium.org Change-Id: I75e7143b670fb0110c98607556572454f8205958 Reviewed-on: https://chromium-review.googlesource.com/1105417 Reviewed-by: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#568297} [modify] https://crrev.com/e50f482d73515a178ec1ed954d6082410808b53f/DEPS
,
Jun 21 2018
Looks like this is fixed :)
,
Jun 21 2018
Awesome. Thank you very much Edward! |
|||
►
Sign in to add a comment |
|||
Comment 1 by jmad...@chromium.org
, Apr 25 2018