Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1304)

Unified Diff: Source/devtools/BUILD.gn

Issue 665083002: DevTools: Fix Windows debug_devtools=1 builds (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix variable type on command line in gyp Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/devtools/devtools.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/BUILD.gn
diff --git a/Source/devtools/BUILD.gn b/Source/devtools/BUILD.gn
index 8198838c9d4a556f5317a2cd49f51ebea00ef160..17e8634b0607248adb7c453c9ad59b9fb13d9c98 100644
--- a/Source/devtools/BUILD.gn
+++ b/Source/devtools/BUILD.gn
@@ -109,16 +109,19 @@ action("generate_devtools_grd") {
script = "scripts/generate_devtools_grd.py"
deps = [ ":devtools_frontend_resources" ]
+ static_files_list = "$target_gen_dir/devtools_static_grd_files.tmp"
+ inputs = [ static_files_list ]
if (debug_devtools) {
# Debug: all files are picked as-is.
- input_pages = all_devtools_files + generated_scripts + [
+ generated_files = generated_scripts + [
resources_out_dir + "devtools.html",
resources_out_dir + "toolbox.html",
]
+ static_files = all_devtools_files + [ "front_end/Runtime.js" ]
} else {
# Release: pick compiled files and lazy-loaded CSS.
- input_pages = [
+ generated_files = [
resources_out_dir + "devtools.css",
resources_out_dir + "devtools.html",
resources_out_dir + "devtools.js",
@@ -130,7 +133,6 @@ action("generate_devtools_grd") {
resources_out_dir + "devices_module.js",
resources_out_dir + "documentation_module.js",
resources_out_dir + "elements_module.js",
- resources_out_dir + "extensions_module.js",
resources_out_dir + "heap_snapshot_worker_module.js",
resources_out_dir + "layers_module.js",
resources_out_dir + "network_module.js",
@@ -145,14 +147,15 @@ action("generate_devtools_grd") {
resources_out_dir + "timeline_module.js",
resources_out_dir + "devtools_extension_api.js",
]
- input_pages += gypi_values.devtools_standalone_files +
+ static_files = gypi_values.devtools_standalone_files +
gypi_values.devtools_cm_css_files
}
+ write_file(static_files_list, rebase_path(static_files, root_build_dir))
images = gypi_values.devtools_image_files
images_path = "front_end/Images"
- inputs = input_pages + images
+ inputs += generated_files + images
outfile = "$root_gen_dir/devtools/devtools_resources.grd"
outputs = [ outfile ]
@@ -162,7 +165,9 @@ action("generate_devtools_grd") {
"front_end",
]
- args = rebase_path(input_pages, root_build_dir) + [
+ args = rebase_path(generated_files, root_build_dir) +
+ rebase_path(generated_files, root_build_dir) + [
+ "--static_files_list", rebase_path(static_files_list, root_build_dir),
"--relative_path_dirs" ] +
rebase_path(relative_path_dirs, root_build_dir) + [
"--images", rebase_path(images_path, root_build_dir),
@@ -230,7 +235,6 @@ action("build_applications") {
resources_out_dir + "devices_module.js",
resources_out_dir + "documentation_module.js",
resources_out_dir + "elements_module.js",
- resources_out_dir + "extensions_module.js",
resources_out_dir + "heap_snapshot_worker_module.js",
resources_out_dir + "layers_module.js",
resources_out_dir + "network_module.js",
« no previous file with comments | « no previous file | Source/devtools/devtools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698