diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 18:46:02 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 18:46:02 +0000 |
| commit | 113736ca60dff0d00fe7ae03eeb095ac50af48c5 (patch) | |
| tree | e22ec778bdc601bbdfcee42d45f507e6a6da9de5 /sandbox/src | |
| parent | 968e56aeb9ac7c51f7b1cb36cd7a5586fd13e966 (diff) | |
| download | chromium_src-113736ca60dff0d00fe7ae03eeb095ac50af48c5.zip chromium_src-113736ca60dff0d00fe7ae03eeb095ac50af48c5.tar.gz chromium_src-113736ca60dff0d00fe7ae03eeb095ac50af48c5.tar.bz2 | |
Checking in the rest of the .lib changes, previous commit was only done from chrome/ and only got those SConscript files.
R=evanm,bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src')
| -rw-r--r-- | sandbox/src/SConscript | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sandbox/src/SConscript b/sandbox/src/SConscript index 24f88e1..986a783 100644 --- a/sandbox/src/SConscript +++ b/sandbox/src/SConscript @@ -142,8 +142,9 @@ env_tests.Prepend( '/nxcompat',
],
LIBS = [
- 'base.lib',
- 'sandbox.lib',
+ 'base',
+ 'gtest',
+ 'sandbox',
],
LIBPATH = [
'.',
@@ -153,8 +154,6 @@ env_tests.Prepend( controller_obj = env_tests.StaticObject('$TESTS_DIR/common/controller.cc')
-extra_libs = ['$TESTING_DIR/gtest.lib']
-
# Unit Tests
@@ -198,7 +197,7 @@ unit_tests = env_unit_tests.ChromeTestProgram( ['../sbox_unittests.exe',
'../sbox_unittests.ilk',
'../sbox_unittests.pdb'],
- unit_test_files + extra_libs,
+ unit_test_files,
)
@@ -244,7 +243,7 @@ integration_tests = env_integration_tests.ChromeTestProgram( '../sbox_integration_tests.lib',
'../sbox_integration_tests.exp',
'../sbox_integration_tests.pdb'],
- integration_test_files + extra_libs,
+ integration_test_files,
)
@@ -283,7 +282,7 @@ validation_tests = env_validation_tests.ChromeTestProgram( '../sbox_validation_tests.lib',
'../sbox_validation_tests.exp',
'../sbox_validation_tests.pdb'],
- validation_test_files + extra_libs,
+ validation_test_files,
)
|