diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 00:48:02 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 00:48:02 +0000 |
| commit | 6a3cd90b400f51c5efdb06ff31c65b6f75b04fff (patch) | |
| tree | 4b8184b7b7e17026f6ed3da5dfa74d7c5df6d921 /ppapi | |
| parent | f79711187369bdb34710e4ec78577826ba30d311 (diff) | |
| download | chromium_src-6a3cd90b400f51c5efdb06ff31c65b6f75b04fff.zip chromium_src-6a3cd90b400f51c5efdb06ff31c65b6f75b04fff.tar.gz chromium_src-6a3cd90b400f51c5efdb06ff31c65b6f75b04fff.tar.bz2 | |
r118503 introduced a dependency on WebKit.gyp to ppapi_shared;
unfortunately the dependency only worked when building chromium in a
chromium checkout and not a webkit-only checkout. This fixes that.
R=piman@chromium.org, ananta@chromium.org
BUG=110910
TEST=build.webkit.org chromium bots can run gyp happily.
Review URL: https://chromiumcodereview.appspot.com/9131026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/ppapi_shared.gypi | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index 113e826..a12a097 100644 --- a/ppapi/ppapi_shared.gypi +++ b/ppapi/ppapi_shared.gypi @@ -3,7 +3,16 @@ # found in the LICENSE file. { - 'targets': [ + 'variables': { + 'conditions': [ + ['inside_chromium_build==0', { + 'webkit_src_dir': '../../../..', + },{ + 'webkit_src_dir': '../third_party/WebKit', + }], + ], + }, + 'targets': [ { 'target_name': 'ppapi_shared', 'type': '<(component)', @@ -18,7 +27,7 @@ '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icuuc', # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL. - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', + '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/gfx/surface/surface.gyp:surface', ], 'defines': [ @@ -30,7 +39,7 @@ ], 'export_dependent_settings': [ '../base/base.gyp:base', - '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', + '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'conditions': [ ['OS=="mac"', { |