Tracing is the last remaining user of gypi_to_gn.py: https://github.com/catapult-project/catapult/blob/master/tracing/BUILD.gn#L5 There's some tooling around trace_viewer.gypi that needs to be updated at the same time as it is converted to gn.
https://chromium-review.googlesource.com/c/catapult/+/1283940 (thanks for getting to this so quickly!)
The following revision refers to this bug: https://chromium.googlesource.com/catapult/+/30824c537e6ae7d52e8996121237b53ec26bf899 commit 30824c537e6ae7d52e8996121237b53ec26bf899 Author: benshayden <benjhayden@chromium.org> Date: Wed Oct 17 02:07:54 2018 Migrate trace_viewer.gypi to gni This is the last user of gypi_to_gn.py, so after this CL, that script can be deleted. This CL is mostly find+replace, but a couple regexes needed updating. Bug: chromium:895699 Change-Id: Ifaefdf82625fc7912066032ce7fd4d5c8e0b6946 Reviewed-on: https://chromium-review.googlesource.com/c/1283940 Reviewed-by: Sean McCullough <seanmccullough@chromium.org> Reviewed-by: Ned Nguyen <nednguyen@google.com> Commit-Queue: Ned Nguyen <nednguyen@google.com> [delete] https://crrev.com/b273e0cd217d87f33caacb8ed15d85801fcca9ea/tracing/trace_viewer.gypi [delete] https://crrev.com/b273e0cd217d87f33caacb8ed15d85801fcca9ea/tracing/trace_viewer.gyp [rename] https://crrev.com/30824c537e6ae7d52e8996121237b53ec26bf899/tracing/bin/update_gni [rename] https://crrev.com/30824c537e6ae7d52e8996121237b53ec26bf899/tracing/tracing_build/update_gni.py [modify] https://crrev.com/30824c537e6ae7d52e8996121237b53ec26bf899/tracing/tracing_build/check_common.py [modify] https://crrev.com/30824c537e6ae7d52e8996121237b53ec26bf899/tracing/BUILD.gn [add] https://crrev.com/30824c537e6ae7d52e8996121237b53ec26bf899/tracing/tracing_build/check_gni.py [add] https://crrev.com/30824c537e6ae7d52e8996121237b53ec26bf899/tracing/tracing_build/update_gni_unittest.py [modify] https://crrev.com/30824c537e6ae7d52e8996121237b53ec26bf899/BUILD.gn [modify] https://crrev.com/30824c537e6ae7d52e8996121237b53ec26bf899/tracing/PRESUBMIT.py [modify] https://crrev.com/30824c537e6ae7d52e8996121237b53ec26bf899/tracing/bin/README.md [add] https://crrev.com/30824c537e6ae7d52e8996121237b53ec26bf899/tracing/trace_viewer.gni [delete] https://crrev.com/b273e0cd217d87f33caacb8ed15d85801fcca9ea/tracing/tracing_build/update_gypi_unittest.py [delete] https://crrev.com/b273e0cd217d87f33caacb8ed15d85801fcca9ea/tracing/tracing_build/check_gypi.py
The following revision refers to this bug: https://chromium.googlesource.com/catapult/+/519565187c85418c6d1443ec24bd1012afdfb247 commit 519565187c85418c6d1443ec24bd1012afdfb247 Author: Ben Hayden <benjhayden@chromium.org> Date: Wed Oct 17 18:34:12 2018 Revert "Migrate trace_viewer.gypi to gni" This reverts commit 30824c537e6ae7d52e8996121237b53ec26bf899. Reason for revert: /b/swarming/w/ir/cache/builder/src/buildtools/linux64/gn gen //out/Release -> returned 1 ERROR at //third_party/catapult/tracing/trace_viewer.gni:6:3: Invalid token. 'tracing/ui/extras/about_tracing/common.css', ^ Strings are delimited by " characters, not apostrophes. See //content/browser/tracing/BUILD.gn:33:5: which caused the file to be included. "//third_party/catapult/tracing:generate_about_tracing", ^------------------------------------------------------ GN gen failed: 1 https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8932399044620857344/+/steps/analyze/0/stdout Original change's description: > Migrate trace_viewer.gypi to gni > > This is the last user of gypi_to_gn.py, so after this CL, that script > can be deleted. > > This CL is mostly find+replace, but a couple regexes needed updating. > > Bug: chromium:895699 > Change-Id: Ifaefdf82625fc7912066032ce7fd4d5c8e0b6946 > Reviewed-on: https://chromium-review.googlesource.com/c/1283940 > Reviewed-by: Sean McCullough <seanmccullough@chromium.org> > Reviewed-by: Ned Nguyen <nednguyen@google.com> > Commit-Queue: Ned Nguyen <nednguyen@google.com> TBR=thakis@chromium.org,benjhayden@chromium.org,seanmccullough@chromium.org,nednguyen@google.com Change-Id: Iec747224aa90e2ff8d4e5bb9b3d6f2bb7b392dbc No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:895699 Reviewed-on: https://chromium-review.googlesource.com/c/1286375 Reviewed-by: Ben Hayden <benjhayden@chromium.org> Commit-Queue: Ben Hayden <benjhayden@chromium.org> [add] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/tracing/trace_viewer.gypi [add] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/tracing/trace_viewer.gyp [rename] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/tracing/tracing_build/update_gypi.py [modify] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/tracing/tracing_build/check_common.py [modify] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/tracing/BUILD.gn [delete] https://crrev.com/eaee360dff049813c014cd27c3b689b300033012/tracing/tracing_build/check_gni.py [delete] https://crrev.com/eaee360dff049813c014cd27c3b689b300033012/tracing/tracing_build/update_gni_unittest.py [modify] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/BUILD.gn [modify] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/tracing/PRESUBMIT.py [modify] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/tracing/bin/README.md [rename] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/tracing/bin/update_gypi [delete] https://crrev.com/eaee360dff049813c014cd27c3b689b300033012/tracing/trace_viewer.gni [add] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/tracing/tracing_build/update_gypi_unittest.py [add] https://crrev.com/519565187c85418c6d1443ec24bd1012afdfb247/tracing/tracing_build/check_gypi.py
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/d78223532dd4dc471195262fdcdcca227861f1b9 commit d78223532dd4dc471195262fdcdcca227861f1b9 Author: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Date: Wed Oct 17 20:07:40 2018 Roll src/third_party/catapult b273e0cd217d..519565187c85 (4 commits) https://chromium.googlesource.com/catapult.git/+log/b273e0cd217d..519565187c85 git log b273e0cd217d..519565187c85 --date=short --no-merges --format='%ad %ae %s' 2018-10-17 benjhayden@chromium.org Revert "Migrate trace_viewer.gypi to gni" 2018-10-17 nednguyen@google.com Add support for --repeat flag in typ 2018-10-17 chiniforooshan@chromium.org aura: filter out frames not submitted from browser 2018-10-17 benjhayden@chromium.org Migrate trace_viewer.gypi to gni Created with: gclient setdep -r src/third_party/catapult@519565187c85 The AutoRoll server is located here: https://autoroll.skia.org/r/catapult-autoroll 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:895699 ,chromium:894261, chromium:883894 , chromium:895699 TBR=sullivan@chromium.org Change-Id: I42ab97661d390f5ea0e56de3f6196dd4ac19a925 Reviewed-on: https://chromium-review.googlesource.com/c/1286751 Reviewed-by: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#600532} [modify] https://crrev.com/d78223532dd4dc471195262fdcdcca227861f1b9/DEPS
The following revision refers to this bug: https://chromium.googlesource.com/catapult/+/623a134fbd086b5feb1d3a91b16f14bba8090a8f commit 623a134fbd086b5feb1d3a91b16f14bba8090a8f Author: benshayden <benjhayden@chromium.org> Date: Mon Oct 22 17:34:13 2018 Reland Migrate trace_viewer.gypi to gni Reason for revert: /b/swarming/w/ir/cache/builder/src/buildtools/linux64/gn gen //out/Release -> returned 1 ERROR at //third_party/catapult/tracing/trace_viewer.gni:6:3: Invalid token. 'tracing/ui/extras/about_tracing/common.css', ^ Strings are delimited by " characters, not apostrophes. See //content/browser/tracing/BUILD.gn:33:5: which caused the file to be included. "//third_party/catapult/tracing:generate_about_tracing", ^------------------------------------------------------ GN gen failed: 1 https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8932399044620857344/+/steps/analyze/0/stdout This is the last user of gypi_to_gn.py, so after this CL, that script can be deleted. This CL is mostly find+replace, but a couple regexes needed updating. Bug: chromium:895699 Change-Id: I1b37bce05d5504ea1b0fac19e3f0ab97fa134676 Reviewed-on: https://chromium-review.googlesource.com/c/1283940 Reviewed-by: Sean McCullough <seanmccullough@chromium.org> Reviewed-by: Ned Nguyen <nednguyen@google.com> Commit-Queue: Ned Nguyen <nednguyen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/1286377 Reviewed-by: Annie Sullivan <sullivan@chromium.org> Commit-Queue: Ben Hayden <benjhayden@chromium.org> [delete] https://crrev.com/b6835fc707c786722d2563f3570c139718dca3c0/tracing/trace_viewer.gypi [delete] https://crrev.com/b6835fc707c786722d2563f3570c139718dca3c0/tracing/trace_viewer.gyp [rename] https://crrev.com/623a134fbd086b5feb1d3a91b16f14bba8090a8f/tracing/bin/update_gni [rename] https://crrev.com/623a134fbd086b5feb1d3a91b16f14bba8090a8f/tracing/tracing_build/update_gni.py [modify] https://crrev.com/623a134fbd086b5feb1d3a91b16f14bba8090a8f/tracing/tracing_build/check_common.py [modify] https://crrev.com/623a134fbd086b5feb1d3a91b16f14bba8090a8f/tracing/BUILD.gn [add] https://crrev.com/623a134fbd086b5feb1d3a91b16f14bba8090a8f/tracing/tracing_build/check_gni.py [add] https://crrev.com/623a134fbd086b5feb1d3a91b16f14bba8090a8f/tracing/tracing_build/update_gni_unittest.py [modify] https://crrev.com/623a134fbd086b5feb1d3a91b16f14bba8090a8f/BUILD.gn [modify] https://crrev.com/623a134fbd086b5feb1d3a91b16f14bba8090a8f/tracing/PRESUBMIT.py [modify] https://crrev.com/623a134fbd086b5feb1d3a91b16f14bba8090a8f/tracing/bin/README.md [add] https://crrev.com/623a134fbd086b5feb1d3a91b16f14bba8090a8f/tracing/trace_viewer.gni [delete] https://crrev.com/b6835fc707c786722d2563f3570c139718dca3c0/tracing/tracing_build/update_gypi_unittest.py [delete] https://crrev.com/b6835fc707c786722d2563f3570c139718dca3c0/tracing/tracing_build/check_gypi.py
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/d2382a804000bab65606c559ede6465b09e357bc commit d2382a804000bab65606c559ede6465b09e357bc Author: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Date: Mon Oct 22 20:13:03 2018 Roll src/third_party/catapult 6ab9bc6fcb3d..623a134fbd08 (2 commits) https://chromium.googlesource.com/catapult.git/+log/6ab9bc6fcb3d..623a134fbd08 git log 6ab9bc6fcb3d..623a134fbd08 --date=short --no-merges --format='%ad %ae %s' 2018-10-22 benjhayden@chromium.org Reland Migrate trace_viewer.gypi to gni 2018-10-22 perezju@chromium.org [soundwave] Post process data for data studios Created with: gclient setdep -r src/third_party/catapult@623a134fbd08 The AutoRoll server is located here: https://autoroll.skia.org/r/catapult-autoroll 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:895699 , chromium:894773 TBR=sullivan@chromium.org Change-Id: I0eb0337711b8a2b45055d5b63e4b3fde7c9d3478 Reviewed-on: https://chromium-review.googlesource.com/c/1294220 Reviewed-by: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#601703} [modify] https://crrev.com/d2382a804000bab65606c559ede6465b09e357bc/DEPS
Thanks!
Comment 1 by thakis@chromium.org
, Oct 16