summaryrefslogtreecommitdiffstats
path: root/chrome/SConscript.unit_tests
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 12:56:04 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 12:56:04 +0000
commit89892f43df8199c81c00a632e427abb5a3ec68fd (patch)
treee2fb8073907fa71cea67f81b8852abe727749841 /chrome/SConscript.unit_tests
parented6fc35b8cac0a19a1c4455189ac648eeef19f94 (diff)
downloadchromium_src-89892f43df8199c81c00a632e427abb5a3ec68fd.zip
chromium_src-89892f43df8199c81c00a632e427abb5a3ec68fd.tar.gz
chromium_src-89892f43df8199c81c00a632e427abb5a3ec68fd.tar.bz2
Enable safe browsing tests exercising VerifyMAC. Reorder libraries to match the dependency order required on Posix.
Patch from Pawel Hajdan Jr. Review URL: http://codereview.chromium.org/3143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2361 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConscript.unit_tests')
-rw-r--r--chrome/SConscript.unit_tests7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests
index f5fd0d0..1df2231 100644
--- a/chrome/SConscript.unit_tests
+++ b/chrome/SConscript.unit_tests
@@ -30,10 +30,14 @@ env_test.Prepend(
'CHROME_PNG_WRITE_SUPPORT',
'UNIT_TEST',
],
+
+ # On Linux, dependencies must come after the libraries that depend on it.
+ # base must come after net, bzip2 must come before base, etc.
LIBS = [
+ 'net',
+ 'bzip2',
'base',
'base_gfx',
- 'bzip2',
'googleurl',
'gtest',
'icuuc',
@@ -42,7 +46,6 @@ env_test.Prepend(
'libxml',
'libxslt',
'modp_b64',
- 'net',
'skia',
'v8',
'zlib',