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

Unified Diff: chrome/BUILD.gn

Issue 2038593002: [Mac/GN] When using debug_devtools=true, bundle the inspector resources using a symlink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | chrome/test/BUILD.gn » ('j') | chrome/test/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 6fb3011e30b37472da5828c3bb5e8ec69028e2e1..e26c0835594318a313b38f65f801922b0e66bbb8 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -418,6 +418,7 @@ if (is_win) {
group("chrome") {
deps = [
":chrome_app",
+ ":devtools_debug_resources",
]
}
@@ -686,6 +687,52 @@ 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,
+ ]
+
+ # Convert the destination to an absolute path to make symlinking easier
+ # (no pwd manipulation).
+ _symlink_dest = rebase_path(
+ "$root_out_dir/$chrome_product_full_name.app/Contents/Versions/$chrome_version_full/$chrome_framework_name.framework/Resources/inspector")
+
+ _stamp_arg = rebase_path(_stamp, root_out_dir)
+
+ if (debug_devtools) {
+ script = "//build/symlink.py"
+ args = [
+ "-f",
+ "--touch",
+ _stamp_arg,
+
+ # Convert the symlink source to an absolute path, too.
+ rebase_path("$root_out_dir/resources/inspector"),
+ _symlink_dest,
+ ]
+ } else {
+ script = "//build/rmdir_and_stamp.py"
Nico 2016/06/02 18:03:46 rmdir_and_stamp removes the symlink, not the conte
Robert Sesek 2016/06/02 18:20:08 Correct.
Robert Sesek 2016/06/02 18:41:56 Actually, the rmdir is unnecessary because when co
Nico 2016/06/02 18:44:34 I figured the rmdir is here so that if you remove
Robert Sesek 2016/06/02 18:47:11 If you remove devtools_debug, it will create a new
+ args = [
+ _symlink_dest,
+ _stamp_arg,
+ ]
+ }
+
+ 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) {
bundle_data("chrome_framework_plugins") {
sources = []
« no previous file with comments | « no previous file | chrome/test/BUILD.gn » ('j') | chrome/test/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698