summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-03 21:21:33 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-03 21:21:33 +0000
commitf1db7a1f34514312bd704e1b966ff40d2666dee7 (patch)
tree17289f79a19fba8b28a9a1970fc29e050d16c778 /base
parentdf2615ef196cd019e74187721e42360346f1d455 (diff)
downloadchromium_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 'base')
-rw-r--r--base/SConscript8
-rw-r--r--base/gfx/SConscript2
2 files changed, 5 insertions, 5 deletions
diff --git a/base/SConscript b/base/SConscript
index 635e7b1..424d98d 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -113,7 +113,7 @@ input_files = [
'worker_pool.cc',
]
-env.StaticLibrary('base', input_files)
+env.ChromeStaticLibrary('base', input_files)
env_tests.Prepend(
@@ -199,7 +199,7 @@ env_tests_dll.Append(
'SINGLETON_UNITTEST_EXPORTS',
],
)
-dll = env_tests_dll.SharedLibrary(['singleton_dll_unittest.dll',
+dll = env_tests_dll.ChromeSharedLibrary(['singleton_dll_unittest.dll',
'singleton_dll_unittest.ilk',
'singleton_dll_unittest.pdb'],
['singleton_dll_unittest.cc',
@@ -207,7 +207,7 @@ dll = env_tests_dll.SharedLibrary(['singleton_dll_unittest.dll',
i = env.Install('$TARGET_ROOT', dll[0])
env.Alias('base', i)
-env_tests.Program(['debug_message.exe',
+env_tests.ChromeTestProgram(['debug_message.exe',
'debug_message.ilk',
'debug_message.pdb'],
['debug_message.cc'] + libs)
@@ -263,7 +263,7 @@ test_files = [
'singleton_dll_unittest.lib',
]
-base_unittests = env_tests.Program([
+base_unittests = env_tests.ChromeTestProgram([
'base_unittests',
'base_unittests.exp',
'base_unittests.ilk',
diff --git a/base/gfx/SConscript b/base/gfx/SConscript
index 022b35f..f5eec6b 100644
--- a/base/gfx/SConscript
+++ b/base/gfx/SConscript
@@ -73,4 +73,4 @@ input_files = [
'vector_device.cc',
]
-env.StaticLibrary('base_gfx', input_files)
+env.ChromeStaticLibrary('base_gfx', input_files)