content/content_browser.gypi - Issue 808573003: Make devtools use common generated blink source directory instead of gen/webkit.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_browser.gypi

Issue 808573003: Make devtools use common generated blink source directory instead of gen/webkit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removing the landmine. Created 6 years 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

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index 7f41dcef4ba6a5562f676be7e4fd6b50312008dc..099c329da552be06c93866257ec250f204c54716 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -1415,9 +1415,9 @@

'zygote/zygote_linux.h',

'zygote/zygote_main_linux.cc',

# These files are generated by GRIT.

- '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources.h',

- '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.cc',

- '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.h',

+ '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources.h',

+ '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.cc',

+ '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.h',

'<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/grit/tracing_resources.h',

'<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc',

# These files are generated by devtools_protocol_handler_generator.py.

« no previous file with comments | « content/browser/devtools/devtools_resources.gyp ('k') | content/content_shell.gypi » ('j') | no next file with comments »