diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-03 21:21:33 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-03 21:21:33 +0000 |
| commit | f1db7a1f34514312bd704e1b966ff40d2666dee7 (patch) | |
| tree | 17289f79a19fba8b28a9a1970fc29e050d16c778 /net/SConscript | |
| parent | df2615ef196cd019e74187721e42360346f1d455 (diff) | |
| download | chromium_src-f1db7a1f34514312bd704e1b966ff40d2666dee7.zip chromium_src-f1db7a1f34514312bd704e1b966ff40d2666dee7.tar.gz chromium_src-f1db7a1f34514312bd704e1b966ff40d2666dee7.tar.bz2 | |
Convert submodules SConscript files to psuedo-builder calls.
TBR: evanm,bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/SConscript')
| -rw-r--r-- | net/SConscript | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/SConscript b/net/SConscript index fc9d706..4ebf744 100644 --- a/net/SConscript +++ b/net/SConscript @@ -138,7 +138,7 @@ input_files = [ #pch, obj = env_p.PCH(['net.pch', 'precompiled_net.obj'], 'precompiled_net.cc')
#env_p['PCH'] = pch
-#env.StaticLibrary('net', input_files + [obj])
+#env.ChromeStaticLibrary('net', input_files + [obj])
# TODO(bradnelson): This step generates file precompiled_net.pch.ib_tag
# possibly only on incredibuild, scons doesn't know this.
@@ -149,7 +149,7 @@ env['PCH'] = pch env['PCHSTOP'] = 'precompiled_net.h'
env.Append(CCPCHFLAGS = ['/FIprecompiled_net.h'])
-env.StaticLibrary('net', input_files + [obj])
+env.ChromeStaticLibrary('net', input_files + [obj])
env_tests.Prepend(
@@ -258,7 +258,7 @@ unittest_files = [ '$BASE_DIR/run_all_unittests.obj',
]
-net_unittests = env_tests.Program(
+net_unittests = env_tests.ChromeTestProgram(
['net_unittests.exe',
'net_unittests.ilk',
'net_unittests.pdb'],
@@ -267,7 +267,7 @@ net_unittests = env_tests.Program( -stress_cache = env_tests.Program(
+stress_cache = env_tests.ChromeTestProgram(
['stress_cache.exe',
'stress_cache.ilk',
'stress_cache.pdb'],
@@ -276,7 +276,7 @@ stress_cache = env_tests.Program( )
-crash_cache = env_tests.Program(
+crash_cache = env_tests.ChromeTestProgram(
['crash_cache.exe',
'crash_cache.ilk',
'crash_cache.pdb'],
@@ -285,7 +285,7 @@ crash_cache = env_tests.Program( )
-net_perftests = env_tests.Program(
+net_perftests = env_tests.ChromeTestProgram(
['net_perftests.exe',
'net_perftests.ilk',
'net_perftests.pdb'],
|