summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 23:13:26 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 23:13:26 +0000
commit9d384037786ac2912d2ffc82cd1718d8383d8d9f (patch)
treefc85e1d240d0b31c1dd488fcb1723133290d8291 /media
parente66eaf0cc9fe5c6c17ffee01fc2d370270b9e07f (diff)
downloadchromium_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 'media')
-rw-r--r--media/media.gyp11
1 files changed, 11 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 2151cde..84451d3 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -98,6 +98,17 @@
'filters/video_decoder_unittest.cc',
'filters/video_renderer_unittest.cc',
],
+ 'conditions': [
+ ['OS=="linux"', {
+ 'dependencies': [
+ # Needed for the following #include chain:
+ # base/run_all_unittests.cc
+ # ../base/test_suite.h
+ # gtk/gtk.h
+ '../build/linux/system.gyp:gtk',
+ ],
+ }],
+ ],
},
],
}