From 7ebe48cd83a34c04a4c149c0ccd8269ef8a25eb5 Mon Sep 17 00:00:00 2001 From: Tim van der Lippe Date: Mon, 13 Jul 2020 13:27:15 +0100 Subject: [PATCH] Cleanup indirection of data_deps in devtools_all_files The target `:devtools_frontend_resources_data` specified its deps as `data_deps`. However, this indirection is unnecessary, as this target is only used in `:devtools_all_files`. Therefore, if we inline the deps from `:devtools_frontend_resources_data` into `:devtools_all_files` and change it to `data_deps` instead. R=aerotwist@chromium.org Change-Id: I80940d13cd13eddd0bb1bd14e671aa5b7175b270 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2292284 Commit-Queue: Tim van der Lippe Reviewed-by: Paul Lewis --- BUILD.gn | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index d30ad0bd04..298ae29981 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -922,16 +922,6 @@ foreach(module, devtools_module_entrypoints) { generated_devtools_module_entrypoints += [ "$resources_out_dir/$module" ] } -group("devtools_all_files") { - testonly = true - data = all_devtools_files + generated_devtools_module_entrypoints - data += [ - # This enables us to test bots with whitespace changes. - "scripts/whitespaces.txt", - ] - deps = [ ":devtools_frontend_resources_data" ] -} - devtools_frontend_resources_deps = [ ":build_release_devtools", ":copy_embedder_scripts", @@ -941,6 +931,7 @@ devtools_frontend_resources_deps = [ ":copy_wasm_deps", ":devtools_extension_api", "front_end", + "test", # Required for layout tests, which depend on the existence of `integration_test_runner.html` # If we don't add this dependency explicitly, the swarming bots don't pick up the file. @@ -955,14 +946,14 @@ if (is_debug) { devtools_frontend_resources_deps += [ ":copy_devtools_modules" ] } -devtools_frontend_resources_data_test_deps = devtools_frontend_resources_deps - -# It is unclear why, but the Android Ninja configuration starts warning about -# duplicate files being generated. This does not happen for regular Chromium -# builds. Since we don't run these tests on Android any case, we disable -# the generation of the tests on Android. -if (!is_android) { - devtools_frontend_resources_data_test_deps += [ "test" ] +group("devtools_all_files") { + testonly = true + data = all_devtools_files + generated_devtools_module_entrypoints + data += [ + # This enables us to test bots with whitespace changes. + "scripts/whitespaces.txt", + ] + data_deps = devtools_frontend_resources_deps } group("devtools_frontend_resources") { @@ -973,12 +964,6 @@ group("generate_devtools_inspector_overlay_resources") { public_deps = [ "front_end/inspector_overlay:build_inspector_overlay" ] } -# Do not use this unless you need unpacked devtools at runtime. -group("devtools_frontend_resources_data") { - testonly = true - data_deps = devtools_frontend_resources_data_test_deps -} - copy("copy_embedder_scripts") { sources = devtools_embedder_scripts outputs = [ "$resources_out_dir/{{source_file_part}}" ]