Allow for building content_shell from within WebKit

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10388218

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138231 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 36 insertions, 9 deletions

diff --git a/content/browser/debugger/devtools_resources.gyp b/content/browser/debugger/devtools_resources.gyp
index f29be19..79670d4 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',
diff --git a/content/content.gyp b/content/content.gyp
index ce006f1..737479f 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -6,16 +6,34 @@
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
     'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
+    'conditions': [
+      ['inside_chromium_build==0', {
+        'webkit_src_dir': '../../../..',
+      },{
+        'webkit_src_dir': '../third_party/WebKit',
+      }],
+    ],
   },
   'includes': [
     '../build/win_precompile.gypi',
     'content_shell.gypi',
-    'content_tests.gypi',
   ],
   'target_defaults': {
     'defines': ['CONTENT_IMPLEMENTATION'],
+    'conditions': [
+      ['inside_chromium_build==0', {
+        'dependencies': [
+          '../webkit/support/setup_third_party.gyp:third_party_headers',
+        ],
+      }],
+    ],
   },
   'conditions': [
+    ['inside_chromium_build==1', {
+      'includes': [
+        'content_tests.gypi',
+      ]
+    }],
    # In component mode, we build all of content as a single DLL.
    # However, in the static mode, we need to build content as multiple
    # targets in order to prevent dependencies from getting introduced
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 3b96e9d..ecefda0 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -14,7 +14,7 @@
     '../skia/skia.gyp:skia',
     '../third_party/flac/flac.gyp:libflac',
     '../third_party/speex/speex.gyp:libspeex',
-    '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+    '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
     '../third_party/zlib/zlib.gyp:zlib',
     '../ui/surface/surface.gyp:surface',
     '../ui/ui.gyp:ui',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index e7114b6..4295110 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -14,7 +14,7 @@
     '../skia/skia.gyp:skia',
     '../third_party/icu/icu.gyp:icuuc',
     '../third_party/npapi/npapi.gyp:npapi',
-    '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+    '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
     '../ui/gl/gl.gyp:gl',
     '../ui/ui.gyp:ui',
     '../webkit/support/webkit_support.gyp:appcache',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 4896ed9..04babf2 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -15,7 +15,7 @@
     '../third_party/libjingle/libjingle.gyp:libjingle',
     '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
     '../third_party/npapi/npapi.gyp:npapi',
-    '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+    '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
     '../ui/surface/surface.gyp:surface',
     '../v8/tools/gyp/v8.gyp:v8',
     '../webkit/support/webkit_support.gyp:webkit_media',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index aad91af..c74c7ec 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -33,7 +33,7 @@
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
-        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../ui/ui.gyp:ui',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/support/webkit_support.gyp:appcache',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index fe6fc76..0142388 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -16,7 +16,7 @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libvpx/libvpx.gyp:libvpx',
-        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../ui/surface/surface.gyp:surface',
         '../ui/ui.gyp:ui_test_support',
         '../webkit/support/webkit_support.gyp:appcache',
@@ -184,7 +184,7 @@
         '../testing/gtest.gyp:gtest',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libvpx/libvpx.gyp:libvpx',
-        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui',
         '../v8/tools/gyp/v8.gyp:v8',
diff --git a/content/content_worker.gypi b/content/content_worker.gypi
index 9ecda78..a5f6766 100644
--- a/content/content_worker.gypi
+++ b/content/content_worker.gypi
@@ -6,7 +6,7 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../skia/skia.gyp:skia',
-    '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+    '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
   ],
   'sources': [
     'worker/shared_worker_devtools_agent.cc',