Commit 8d72a79e authored by apavlov@chromium.org's avatar apavlov@chromium.org

DevTools: Fix GN build flakiness

R=yurys

Review URL: https://codereview.chromium.org/359743003

git-svn-id: svn://svn.chromium.org/blink/trunk@177093 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 63ecc1db
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
blink_devtools_output_dir = "$root_gen_dir/blink/devtools/"
gypi_values = exec_script( gypi_values = exec_script(
"//build/gypi_to_gn.py", "//build/gypi_to_gn.py",
[ rebase_path("devtools.gypi") ], [ rebase_path("devtools.gypi") ],
...@@ -186,7 +188,7 @@ action("supported_css_properties") { ...@@ -186,7 +188,7 @@ action("supported_css_properties") {
] ]
outputs = [ outputs = [
"$root_gen_dir/blink/devtools/SupportedCSSProperties.js" blink_devtools_output_dir + "SupportedCSSProperties.js"
] ]
args = rebase_path(source_prereqs, root_build_dir) + args = rebase_path(source_prereqs, root_build_dir) +
...@@ -197,10 +199,10 @@ action("frontend_protocol_sources") { ...@@ -197,10 +199,10 @@ action("frontend_protocol_sources") {
script = "scripts/CodeGeneratorFrontend.py" script = "scripts/CodeGeneratorFrontend.py"
source_prereqs = [ "protocol.json" ] source_prereqs = [ "protocol.json" ]
outputs = [ "$root_gen_dir/blink/devtools/InspectorBackendCommands.js" ] outputs = [ blink_devtools_output_dir + "InspectorBackendCommands.js" ]
args = rebase_path(source_prereqs, root_build_dir) + [ args = rebase_path(source_prereqs, root_build_dir) + [
"--output_js_dir", rebase_path("$root_gen_dir/blink", root_build_dir), "--output_js_dir", rebase_path(blink_devtools_output_dir, root_build_dir),
] ]
} }
...@@ -237,13 +239,13 @@ action("build_core_module") { ...@@ -237,13 +239,13 @@ action("build_core_module") {
input_page = "front_end/inspector.html" input_page = "front_end/inspector.html"
source_prereqs = [ source_prereqs = [
input_page, input_page,
"$root_gen_dir/blink/devtools/InspectorBackendCommands.js", blink_devtools_output_dir + "InspectorBackendCommands.js",
"$root_gen_dir/blink/devtools/SupportedCSSProperties.js", blink_devtools_output_dir + "SupportedCSSProperties.js",
"$root_gen_dir/blink/devtools/common/modules.js", blink_devtools_output_dir + "common/modules.js",
] + devtools_core_js_files ] + devtools_core_js_files
search_path = [ search_path = [
"$root_gen_dir/blink", blink_devtools_output_dir,
"front_end", "front_end",
] ]
outputs = [ outputs = [
...@@ -366,7 +368,7 @@ action("concatenated_module_descriptors") { ...@@ -366,7 +368,7 @@ action("concatenated_module_descriptors") {
input = "front_end/common/modules.js" input = "front_end/common/modules.js"
source_prereqs = [ input ] + gypi_values.devtools_module_json_files source_prereqs = [ input ] + gypi_values.devtools_module_json_files
outputs = [ "$root_gen_dir/blink/devtools/common/modules.js" ] outputs = [ blink_devtools_output_dir + "common/modules.js" ]
args = rebase_path([ input ] + outputs + gypi_values.devtools_module_json_files, root_build_dir) args = rebase_path([ input ] + outputs + gypi_values.devtools_module_json_files, root_build_dir)
} }
......
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