diff options
| author | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 11:17:51 +0000 |
|---|---|---|
| committer | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 11:17:51 +0000 |
| commit | efe25e2f17d2c8859b30fe666466de405ffa8f27 (patch) | |
| tree | ccd6c1ed23f10aef22c7d34866d25273d9ea9320 /base/SConscript | |
| parent | a61d561545b48f95d6b36c40c80caf50ed0a902b (diff) | |
| download | chromium_src-efe25e2f17d2c8859b30fe666466de405ffa8f27.zip chromium_src-efe25e2f17d2c8859b30fe666466de405ffa8f27.tar.gz chromium_src-efe25e2f17d2c8859b30fe666466de405ffa8f27.tar.bz2 | |
Implement nspr time on Linux.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/SConscript')
| -rw-r--r-- | base/SConscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/SConscript b/base/SConscript index f654d1f..b7cb98b 100644 --- a/base/SConscript +++ b/base/SConscript @@ -76,11 +76,13 @@ input_files = [ 'string_piece.cc', 'string_util.cc', 'string_util_icu.cc', + 'time.cc', 'timer.cc', 'tracked.cc', 'tracked_objects.cc', 'values.cc', 'word_iterator.cc', + 'third_party/nspr/prtime.cc', ] if env['PLATFORM'] == 'win32': @@ -107,10 +109,8 @@ if env['PLATFORM'] == 'win32': 'sha2.cc', 'shared_event.cc', 'stats_table.cc', - 'third_party/nspr/prtime.cc', 'third_party/nss/sha512.cc', 'thread.cc', - 'time.cc', 'watchdog.cc', 'worker_pool.cc', ]) @@ -248,7 +248,9 @@ test_files = [ 'string_escape_unittest.cc', 'string_piece_unittest.cc', 'string_tokenizer_unittest.cc', + 'time_unittest.cc', 'values_unittest.cc', + 'waitable_event_unittest.cc', 'gfx/convolver_unittest.cc', 'gfx/rect_unittest.cc', ] @@ -280,9 +282,7 @@ if env['PLATFORM'] == 'win32': 'thread_local_storage_unittest.cc', 'thread_unittest.cc', 'timer_unittest.cc', - 'time_unittest.cc', 'tracked_objects_test.cc', - 'waitable_event_unittest.cc', 'word_iterator_unittest.cc', 'gfx/image_operations_unittest.cc', 'gfx/native_theme_unittest.cc', |