summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-17 00:16:39 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-17 00:16:39 +0000
commit3df7b52a11ed8445b6430df5b202d375931d1767 (patch)
tree153262c76940c5d95cf14b4cd8410e65590a0b55 /media
parente16027d6b660ac4c0d9b50e7dabbf03d7cf1ba5f (diff)
downloadchromium_src-3df7b52a11ed8445b6430df5b202d375931d1767.zip
chromium_src-3df7b52a11ed8445b6430df5b202d375931d1767.tar.gz
chromium_src-3df7b52a11ed8445b6430df5b202d375931d1767.tar.bz2
Put base/media.cc in the SCons build.
SCons doesn't generate a library with no source files, leading to a build error on Linux (when trying to build the whole tree) and Windows. Review URL: http://codereview.chromium.org/10784 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media_lib.scons1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/media_lib.scons b/media/media_lib.scons
index de42fed..ba044e6 100644
--- a/media/media_lib.scons
+++ b/media/media_lib.scons
@@ -25,6 +25,7 @@ env.Prepend(
# These net files work on *all* platforms; files that don't work
# cross-platform live below.
input_files = [
+ 'base/media.cc',
]
if env['PLATFORM'] == 'win32':