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

Unified Diff: content/browser/debugger/devtools_resources.gyp

Issue 10388218: Allow for building content_shell from within WebKit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 8 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 | content/content.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/debugger/devtools_resources.gyp
diff --git a/content/browser/debugger/devtools_resources.gyp b/content/browser/debugger/devtools_resources.gyp
index f29be19d5b36ac6ba1e2a50b44946598db196a75..79670d436cf08b8d897a3b27b69698e8637e9831 100644
--- a/content/browser/debugger/devtools_resources.gyp
+++ b/content/browser/debugger/devtools_resources.gyp
@@ -3,12 +3,21 @@
# found in the LICENSE file.
{
+ 'variables': {
+ 'conditions': [
+ ['inside_chromium_build==0', {
+ 'webkit_src_dir': '../../../../../..',
+ },{
+ 'webkit_src_dir': '../../../third_party/WebKit',
+ }],
+ ],
+ },
'targets': [
{
'target_name': 'devtools_resources',
'type': 'none',
'dependencies': [
- '../../../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:generate_devtools_grd',
+ '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:generate_devtools_grd',
],
'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
« no previous file with comments | « no previous file | content/content.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698