diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 17:55:50 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 17:55:50 +0000 |
| commit | 9c33a8885fa05cb0fe9b21318c0c6505c9c0fab2 (patch) | |
| tree | 31b222208d6a72b69d78b10416a9c0fc01974570 /base/SConscript | |
| parent | b49cbcf2cb1808755be7d629df962850756fe691 (diff) | |
| download | chromium_src-9c33a8885fa05cb0fe9b21318c0c6505c9c0fab2.zip chromium_src-9c33a8885fa05cb0fe9b21318c0c6505c9c0fab2.tar.gz chromium_src-9c33a8885fa05cb0fe9b21318c0c6505c9c0fab2.tar.bz2 | |
The SHA2 files compile, and the unittests pass, now that nspr/prcpucfg_linux.h is in, so move to the common build sections.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/SConscript')
| -rw-r--r-- | base/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/SConscript b/base/SConscript index e6770c0..228e884 100644 --- a/base/SConscript +++ b/base/SConscript @@ -72,6 +72,7 @@ input_files = [ 'pickle.cc', 'platform_thread.cc', 'revocable_store.cc', + 'sha2.cc', 'string_escape.cc', 'string_piece.cc', 'string_util.cc', @@ -83,6 +84,7 @@ input_files = [ 'values.cc', 'word_iterator.cc', 'third_party/nspr/prtime.cc', + 'third_party/nss/sha512.cc', ] if env['PLATFORM'] == 'win32': @@ -106,10 +108,8 @@ if env['PLATFORM'] == 'win32': 'process_util.cc', 'registry.cc', 'resource_util.cc', - 'sha2.cc', 'shared_event.cc', 'stats_table.cc', - 'third_party/nss/sha512.cc', 'thread.cc', 'watchdog.cc', 'worker_pool.cc', @@ -244,6 +244,7 @@ test_files = [ 'pickle_unittest.cc', 'ref_counted_unittest.cc', 'run_all_unittests.cc', + 'sha2_unittest.cc', 'singleton_unittest.cc', 'stack_container_unittest.cc', 'string_escape_unittest.cc', @@ -274,7 +275,6 @@ if env['PLATFORM'] == 'win32': 'process_util_unittest.cc', 'pr_time_test.cc', 'run_all_unittests.cc', - 'sha2_unittest.cc', 'shared_event_unittest.cc', 'shared_memory_unittest.cc', 'stats_table_unittest.cc', |