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 /build | |
| 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 '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 a06448b..fd41d60 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -61,6 +61,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', @@ -205,6 +206,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') |