diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 22:10:12 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 22:10:12 +0000 |
| commit | 116f3a823b65833ef8a5c56dcf8c2c33a69b914d (patch) | |
| tree | c71b3ccdc0bad1bf28d3c0bd4d63d701870e29ee /build | |
| parent | 2c56af1a6677c9b1141778173dcb1b3bdb63f14b (diff) | |
| download | chromium_src-116f3a823b65833ef8a5c56dcf8c2c33a69b914d.zip chromium_src-116f3a823b65833ef8a5c56dcf8c2c33a69b914d.tar.gz chromium_src-116f3a823b65833ef8a5c56dcf8c2c33a69b914d.tar.bz2 | |
Checking in the media project files (layout based on net/base libraries).
Added a dummy media.cc file in order to produce media.lib so there are no
linker errors when building media_unittests.exe. Currently chrome_dll
does NOT depend on media so it will not be linked in, which is OK for now :)
Review URL: http://codereview.chromium.org/10683
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index cccbd6a..7490da4 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -62,6 +62,7 @@ root_env = Environment( GEARS_DIR = '$OBJ_ROOT/gears', GOOGLE_UPDATE_DIR = '$OBJ_ROOT/google_update', GOOGLEURL_DIR = '$OBJ_ROOT/googleurl', + MEDIA_DIR = '$OBJ_ROOT/media', NET_DIR = '$OBJ_ROOT/net', RLZ_DIR = '$OBJ_ROOT/rlz', SANDBOX_DIR = '$OBJ_ROOT/sandbox', @@ -206,6 +207,9 @@ if LoadComponent('googleurl'): # file. sconscripts.append('$GOOGLEURL_DIR/googleurl.scons') +if LoadComponent('media'): + sconscripts.append('$MEDIA_DIR/media.scons') + if LoadComponent('net'): sconscripts.append('$NET_DIR/net.scons') |