Commit c40350d0 authored by rsesek's avatar rsesek Committed by Commit bot

[Mac/GN] When using debug_devtools=true, bundle the inspector resources using a symlink.

BUG=616657
R=pfeldman@chromium.org,thakis@chromium.org

Review-Url: https://codereview.chromium.org/2038593002
Cr-Commit-Position: refs/heads/master@{#398046}
parent a3fef780
...@@ -426,6 +426,10 @@ if (is_win) { ...@@ -426,6 +426,10 @@ if (is_win) {
deps = [ deps = [
":chrome_app", ":chrome_app",
] ]
if (debug_devtools) {
deps += [ ":devtools_debug_resources" ]
}
} }
tweak_info_plist("chrome_app_plist") { tweak_info_plist("chrome_app_plist") {
...@@ -711,6 +715,39 @@ if (is_win) { ...@@ -711,6 +715,39 @@ if (is_win) {
} }
} }
# When debug_devtools is enabled, symlink the inspector resources into the
# framework bundle. The resources go into the final output directory for the
# framework in the app bundle, rather than the framework bundle in
# root_out_dir, since copy_bundle_data copies the contents of the link
# rather than the link itself.
action("devtools_debug_resources") {
_stamp = "$target_out_dir/run_${target_name}.stamp"
outputs = [
_stamp,
]
script = "//build/symlink.py"
args = [
"-f",
"--touch",
rebase_path(_stamp, root_out_dir),
# Convert the symlink source and destination to an absolute paths, which
# makes symlinking easier (now pwd manipulation).
rebase_path("$root_out_dir/resources/inspector"),
rebase_path(
"$root_out_dir/$chrome_product_full_name.app/Contents/Versions/$chrome_version_full/$chrome_framework_name.framework/Resources/inspector"),
]
deps = [
# Depend on :chrome_app to ensure that the bundle is produced before
# creating or destroying the symlink.
":chrome_app",
"//third_party/WebKit/public:blink_devtools_frontend_resources",
]
}
if (enable_nacl) { if (enable_nacl) {
bundle_data("chrome_framework_plugins") { bundle_data("chrome_framework_plugins") {
sources = [] sources = []
......
...@@ -830,7 +830,10 @@ if (!is_android) { ...@@ -830,7 +830,10 @@ if (!is_android) {
".", ".",
"//chrome") "//chrome")
configs += [ "//build/config:precompiled_headers" ] configs += [
"//build/config:precompiled_headers",
"//third_party/WebKit/public:debug_devtools",
]
data = [ data = [
"data/", "data/",
...@@ -1019,9 +1022,6 @@ if (!is_android) { ...@@ -1019,9 +1022,6 @@ if (!is_android) {
] ]
} }
} }
if (debug_devtools) {
defines += [ "DEBUG_DEVTOOLS=1" ]
}
if (use_ash) { if (use_ash) {
sources += sources +=
rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources, rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources,
......
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