diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 23:52:44 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 23:52:44 +0000 |
| commit | 0dc310a3c7d5c04f24fae2f7b2989dec1b5f4d4a (patch) | |
| tree | c6dc1b6bb055f30f07907887e97f30bc7bb5a58f /skia | |
| parent | f6742f53ed74f9e08f2dfaa11b0a8978d99e8ad0 (diff) | |
| download | chromium_src-0dc310a3c7d5c04f24fae2f7b2989dec1b5f4d4a.zip chromium_src-0dc310a3c7d5c04f24fae2f7b2989dec1b5f4d4a.tar.gz chromium_src-0dc310a3c7d5c04f24fae2f7b2989dec1b5f4d4a.tar.bz2 | |
Remove inside_chromium_build gyp variable
In the days of olde, we supported compiling from inside a chromium checkout and
inside a WebKit checkout with some chromium libraries. In the latter configuration,
used mainly by the build.webkit.org bots, the paths to the WebKit headers relative
to chromium gyp files was different. This added a lot of complexity and some extra
scripts to fix up paths and includes. Blink only supports building within a chromium
checkout so all of this complexity can be removed.
Review URL: https://chromiumcodereview.appspot.com/14823005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 63ab069..117cbc4 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -14,12 +14,6 @@ }, { 'skia_support_gpu': 1, }], - - ['inside_chromium_build==0', { - 'webkit_src_dir': '<(DEPTH)/../../..', - },{ - 'webkit_src_dir': '<(DEPTH)/third_party/WebKit', - }], ], 'optimize': 'max', @@ -334,7 +328,7 @@ ['exclude', '_ios\\.(cc|cpp|mm?)$'], ], 'dependencies': [ - '<(webkit_src_dir)/Source/WebKit/chromium/skia_webkit.gyp:skia_webkit', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/skia_webkit.gyp:skia_webkit', ], }], [ 'OS != "mac"', { |