diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-20 23:13:26 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-20 23:13:26 +0000 |
| commit | 9d384037786ac2912d2ffc82cd1718d8383d8d9f (patch) | |
| tree | fc85e1d240d0b31c1dd488fcb1723133290d8291 /webkit/tools/test_shell/test_shell.gyp | |
| parent | e66eaf0cc9fe5c6c17ffee01fc2d370270b9e07f (diff) | |
| download | chromium_src-9d384037786ac2912d2ffc82cd1718d8383d8d9f.zip chromium_src-9d384037786ac2912d2ffc82cd1718d8383d8d9f.tar.gz chromium_src-9d384037786ac2912d2ffc82cd1718d8383d8d9f.tar.bz2 | |
Update the gyp Linux build:
* Add Linux settings to target_defaults in common.gypi so
gyp-generated SConscript files no longer depend on
build/SConscript.main or the Hammer infrastructure.
* Copy the FilterOut() function from Hammer to the chromium_builders.py
Tool module.
* Add a ChromiumLoadableModule() builder to chromium_builders.py.
* Add dependencies on the 'views' library to the chrome link (target 'app').
* Add missing views/*/*_unittest.cc modules to the 'unit_tests' target.
Exclude all but the one that builds on Linux from the non-Windows builds.
* Crib a list of chrome/views files to exclude from the Linux build
from the old SCons configuration.
* Add a new build/linux/system.gyp file with new 'settings' targets
to encapsulate the pkg-config checks for gtk+-2.0, nss and pangoft2.
* Add depenedencies in the other targets on the new gtk, nss and
pangoft2 'settings' targets from build/linux/system.gyp.
* Add a pkg_config_wrapper.py script that keeps gyp happy by
simply exiting 0 if the package isn't found.
* DEPS roll for latest gyp changes to support the above.
Review URL: http://codereview.chromium.org/42340
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.gyp')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index dd97761..e5b66d5 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -86,6 +86,7 @@ 'test_shell_resources', 'npapi_layout_test_plugin', 'npapi_test_plugin', + '../../../build/linux/system.gyp:gtk', ], # for: test_shell_gtk.cc 'cflags': ['-Wno-multichar'], @@ -160,6 +161,7 @@ 'conditions': [ ['OS=="linux"', { 'dependencies': [ + '../../../build/linux/system.gyp:gtk', '../../../net/net.gyp:net_resources', '../../webkit.gyp:glue', # for webkit_{resources,strings_en-US}.pak 'test_shell_resources', @@ -261,6 +263,9 @@ ], 'conditions': [ ['OS=="linux"', { + 'dependencies': [ + '../../../build/linux/system.gyp:gtk', + ], 'sources!': [ # TODO(port) '../../../skia/ext/platform_canvas_unittest.cc', @@ -348,6 +353,9 @@ '../../glue/plugins/test/plugin_test.cc', '../../glue/plugins/test/plugin_window_size_test.cc', ], + 'include_dirs': [ + '../../..', + ], 'conditions': [ ['OS=="linux"', { 'sources!': [ @@ -374,6 +382,9 @@ '../npapi_layout_test_plugin/PluginObject.cpp', '../npapi_layout_test_plugin/TestObject.cpp', ], + 'include_dirs': [ + '../../..', + ], 'dependencies': [ '../../../third_party/npapi/npapi.gyp:npapi', '../../webkit.gyp:wtf', |