summaryrefslogtreecommitdiffstats
path: root/net/net_lib.scons
diff options
context:
space:
mode:
authormmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-23 23:58:00 +0000
committermmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-23 23:58:00 +0000
commita7791cf2c1c1f565c43a8cb0e337ea0b7ab72b9e (patch)
tree297c4aa3c00586ddd894ed320b667d8a17d565ab /net/net_lib.scons
parenta07cbae73ef54a6c5c8877cffd3e80a581ea7d8d (diff)
downloadchromium_src-a7791cf2c1c1f565c43a8cb0e337ea0b7ab72b9e.zip
chromium_src-a7791cf2c1c1f565c43a8cb0e337ea0b7ab72b9e.tar.gz
chromium_src-a7791cf2c1c1f565c43a8cb0e337ea0b7ab72b9e.tar.bz2
Multiple fixes for broken Linux SHARED=1 build. This gets things building, but the resulting 'chrome' binary crashes on start-up (test_shell seems to work better).
Review URL: http://codereview.chromium.org/27054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net_lib.scons')
-rw-r--r--net/net_lib.scons3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/net_lib.scons b/net/net_lib.scons
index efe3bbf..10453b4 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -11,8 +11,11 @@ Import('env')
env = env.Clone()
env.ApplySConscript([
+ '$BZIP2_DIR/using_bzip2.scons',
+ '$CHROME_SRC_DIR/build/using_googleurl.scons',
'$GRIT_DIR/build/using_generated_resources.scons',
'$ICU38_DIR/using_icu38.scons',
+ '$MODP_B64_DIR/using_modp_b64.scons',
'$SDCH_DIR/using_sdch.scons',
'$ZLIB_DIR/using_zlib.scons',
])