summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authordkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 18:46:26 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 18:46:26 +0000
commit36987e9fae95a51a980b4f0d71ca2df1a630407e (patch)
tree8d77b940020eb84b1926b41c8e5cec964299038c /build
parent5a22409d7b625fa1f2a03194ff6c011f82f150dc (diff)
downloadchromium_src-36987e9fae95a51a980b4f0d71ca2df1a630407e.zip
chromium_src-36987e9fae95a51a980b4f0d71ca2df1a630407e.tar.gz
chromium_src-36987e9fae95a51a980b4f0d71ca2df1a630407e.tar.bz2
Use libevent, second try. Changes this time:
- remove bogus include of base/completion_callback.h - add DEPS rules to allow including third_party/libevent Review URL: http://codereview.chromium.org/2964 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/SConscript.main5
1 files changed, 5 insertions, 0 deletions
diff --git a/build/SConscript.main b/build/SConscript.main
index 25b8fec..df6e80d 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -63,6 +63,7 @@ env = Environment(
BSPATCH_DIR = '$THIRD_PARTY_DIR/bspatch',
BZIP2_DIR = '$THIRD_PARTY_DIR/bzip2',
ICU38_DIR = '$THIRD_PARTY_DIR/icu38',
+ LIBEVENT_DIR = '$THIRD_PARTY_DIR/libevent',
LIBJPEG_DIR = '$THIRD_PARTY_DIR/libjpeg',
LIBPNG_DIR = '$THIRD_PARTY_DIR/libpng',
LIBXML_DIR = '$THIRD_PARTY_DIR/libxml',
@@ -500,6 +501,10 @@ if LoadComponent('third_party'):
'$LIBXML_DIR/SConscript',
'$LIBXSLT_DIR/SConscript',
])
+ if env['PLATFORM'] == 'posix':
+ sconscripts.extend([
+ '$LIBEVENT_DIR/SConscript',
+ ])
# This is temporary until we get this lib to build on other platforms.
if env['PLATFORM'] == 'win32':
sconscripts.extend([