diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 19:10:21 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 19:10:21 +0000 |
commit | a02ff58019cc94efe054751468944ccd5b0ab457 (patch) | |
tree | ac10286e54f395e6c02f95138f5304a7324d6e8d /media/media.scons | |
parent | 322f7f7005061fee5e3b691e6aee318ea93a7eb8 (diff) | |
download | chromium_src-a02ff58019cc94efe054751468944ccd5b0ab457.zip chromium_src-a02ff58019cc94efe054751468944ccd5b0ab457.tar.gz chromium_src-a02ff58019cc94efe054751468944ccd5b0ab457.tar.bz2 |
Recommit of media project files due to a mistake in media_unittest.vcproj
that worked in Visual Studio but broke on IncrediBuild. Also updated to
include dmg_fp dependency.
Trying ONE MORE TIME because I think gcl breaks with "A +" files (I used "svn merge -c REV ." to un-rollback my change).
Original: http://codereview.chromium.org/10683
Rollback: http://codereview.chromium.org/10908
Review URL: http://codereview.chromium.org/10733
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.scons')
-rw-r--r-- | media/media.scons | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/media/media.scons b/media/media.scons new file mode 100644 index 0000000..d069121 --- /dev/null +++ b/media/media.scons @@ -0,0 +1,22 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +__doc__ = """ +Master configuration for building media components. +""" + +Import('env') + +# Arrange for Hammer to add all programs to the 'media' Alias. +env.Append( + COMPONENT_PROGRAM_GROUPS = ['media'], + COMPONENT_TEST_PROGRAM_GROUPS = ['media'], +) + +sconscript_files = [ + 'media_lib.scons', + 'media_unittests.scons', +] + +SConscript(sconscript_files, exports=['env']) |