diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-19 18:10:26 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-19 18:10:26 +0000 |
| commit | e969e9313609a6ad2d64e8605a6f5b3d43cf53a3 (patch) | |
| tree | b779bcec20c8d99d8003f1ac89896e8c9be1a17c /webkit/webkit.gyp | |
| parent | 2f9f2bda98274baa5af7d2231a84cca0970f462c (diff) | |
| download | chromium_src-e969e9313609a6ad2d64e8605a6f5b3d43cf53a3.zip chromium_src-e969e9313609a6ad2d64e8605a6f5b3d43cf53a3.tar.gz chromium_src-e969e9313609a6ad2d64e8605a6f5b3d43cf53a3.tar.bz2 | |
Eliminate using_webkit.{scons,vsprops} in favor of having WebCommon.h set the
default configuration. This simplifies the build system.
My concern was that some consumers of the API might mix-up the defines.
R=dglazkov
Review URL: http://codereview.chromium.org/42392
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 2129e7d..b18a216 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -4113,25 +4113,11 @@ '../third_party/WebKit/WebKit/chromium/src/WebString.cpp', '../third_party/WebKit/WebKit/chromium/src/WebURL.cpp', ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/WebKit/WebKit/chromium/public', - ], - }, 'conditions': [ ['OS=="mac"', { 'sources!': [ '../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp', ], - }, { # else: OS!="mac" - 'defines': [ - 'WEBKIT_USING_SKIA', - ], - 'direct_dependent_settings': { - 'defines': [ - 'WEBKIT_USING_SKIA', - ], - }, }], ['OS=="win"', { 'sources': [ |