Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(641)

Side by Side Diff: trunk/src/base/base.gyp

Issue 16897005: Revert 206507 "Move message_pump to base/message_loop." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/base/android/base_jni_registrar.cc ('k') | trunk/src/base/base.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', 240 'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
241 'third_party/xdg_user_dirs/xdg_user_dir_lookup.h', 241 'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
242 'auto_reset.h', 242 'auto_reset.h',
243 'event_recorder.h', 243 'event_recorder.h',
244 'event_recorder_stubs.cc', 244 'event_recorder_stubs.cc',
245 'event_recorder_win.cc', 245 'event_recorder_win.cc',
246 'linux_util.cc', 246 'linux_util.cc',
247 'linux_util.h', 247 'linux_util.h',
248 'md5.cc', 248 'md5.cc',
249 'md5.h', 249 'md5.h',
250 'message_loop/message_pump_android.cc', 250 'message_pump_android.cc',
251 'message_loop/message_pump_android.h', 251 'message_pump_android.h',
252 'message_loop/message_pump_glib.cc', 252 'message_pump_glib.cc',
253 'message_loop/message_pump_glib.h', 253 'message_pump_glib.h',
254 'message_loop/message_pump_gtk.cc', 254 'message_pump_gtk.cc',
255 'message_loop/message_pump_gtk.h', 255 'message_pump_gtk.h',
256 'message_loop/message_pump_io_ios.cc', 256 'message_pump_io_ios.cc',
257 'message_loop/message_pump_io_ios.h', 257 'message_pump_io_ios.h',
258 'message_loop/message_pump_observer.h', 258 'message_pump_observer.h',
259 'message_loop/message_pump_aurax11.cc', 259 'message_pump_aurax11.cc',
260 'message_loop/message_pump_aurax11.h', 260 'message_pump_aurax11.h',
261 'message_loop/message_pump_libevent.cc', 261 'message_pump_libevent.cc',
262 'message_loop/message_pump_libevent.h', 262 'message_pump_libevent.h',
263 'message_loop/message_pump_mac.h', 263 'message_pump_mac.h',
264 'message_loop/message_pump_mac.mm', 264 'message_pump_mac.mm',
265 'metrics/field_trial.cc', 265 'metrics/field_trial.cc',
266 'metrics/field_trial.h', 266 'metrics/field_trial.h',
267 'posix/file_descriptor_shuffle.cc', 267 'posix/file_descriptor_shuffle.cc',
268 'posix/file_descriptor_shuffle.h', 268 'posix/file_descriptor_shuffle.h',
269 'sync_socket.h', 269 'sync_socket.h',
270 'sync_socket_win.cc', 270 'sync_socket_win.cc',
271 'sync_socket_posix.cc', 271 'sync_socket_posix.cc',
272 ], 272 ],
273 }, 273 },
274 { 274 {
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 'memory/scoped_ptr_unittest.cc', 519 'memory/scoped_ptr_unittest.cc',
520 'memory/scoped_ptr_unittest.nc', 520 'memory/scoped_ptr_unittest.nc',
521 'memory/scoped_vector_unittest.cc', 521 'memory/scoped_vector_unittest.cc',
522 'memory/shared_memory_unittest.cc', 522 'memory/shared_memory_unittest.cc',
523 'memory/singleton_unittest.cc', 523 'memory/singleton_unittest.cc',
524 'memory/weak_ptr_unittest.cc', 524 'memory/weak_ptr_unittest.cc',
525 'memory/weak_ptr_unittest.nc', 525 'memory/weak_ptr_unittest.nc',
526 'message_loop/message_loop_proxy_impl_unittest.cc', 526 'message_loop/message_loop_proxy_impl_unittest.cc',
527 'message_loop/message_loop_proxy_unittest.cc', 527 'message_loop/message_loop_proxy_unittest.cc',
528 'message_loop/message_loop_unittest.cc', 528 'message_loop/message_loop_unittest.cc',
529 'message_loop/message_pump_glib_unittest.cc', 529 'message_pump_glib_unittest.cc',
530 'message_loop/message_pump_io_ios_unittest.cc', 530 'message_pump_io_ios_unittest.cc',
531 'message_loop/message_pump_libevent_unittest.cc', 531 'message_pump_libevent_unittest.cc',
532 'metrics/sample_map_unittest.cc', 532 'metrics/sample_map_unittest.cc',
533 'metrics/sample_vector_unittest.cc', 533 'metrics/sample_vector_unittest.cc',
534 'metrics/bucket_ranges_unittest.cc', 534 'metrics/bucket_ranges_unittest.cc',
535 'metrics/field_trial_unittest.cc', 535 'metrics/field_trial_unittest.cc',
536 'metrics/histogram_base_unittest.cc', 536 'metrics/histogram_base_unittest.cc',
537 'metrics/histogram_unittest.cc', 537 'metrics/histogram_unittest.cc',
538 'metrics/sparse_histogram_unittest.cc', 538 'metrics/sparse_histogram_unittest.cc',
539 'metrics/stats_table_unittest.cc', 539 'metrics/stats_table_unittest.cc',
540 'metrics/statistics_recorder_unittest.cc', 540 'metrics/statistics_recorder_unittest.cc',
541 'observer_list_unittest.cc', 541 'observer_list_unittest.cc',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 ], 677 ],
678 }], 678 }],
679 ['OS == "ios" and _toolset != "host"', { 679 ['OS == "ios" and _toolset != "host"', {
680 'sources/': [ 680 'sources/': [
681 # Only test the iOS-meaningful portion of process_utils. 681 # Only test the iOS-meaningful portion of process_utils.
682 ['exclude', '^process_util_unittest'], 682 ['exclude', '^process_util_unittest'],
683 ['include', '^process_util_unittest_ios\\.cc$'], 683 ['include', '^process_util_unittest_ios\\.cc$'],
684 # Requires spawning processes. 684 # Requires spawning processes.
685 ['exclude', '^metrics/stats_table_unittest\\.cc$'], 685 ['exclude', '^metrics/stats_table_unittest\\.cc$'],
686 # iOS does not use message_pump_libevent. 686 # iOS does not use message_pump_libevent.
687 ['exclude', '^message_loop/message_pump_libevent_unittest\\.cc$'], 687 ['exclude', '^message_pump_libevent_unittest\\.cc$'],
688 ], 688 ],
689 'conditions': [ 689 'conditions': [
690 ['coverage != 0', { 690 ['coverage != 0', {
691 'sources!': [ 691 'sources!': [
692 # These sources can't be built with coverage due to a toolchain 692 # These sources can't be built with coverage due to a toolchain
693 # bug: http://openradar.appspot.com/radar?id=1499403 693 # bug: http://openradar.appspot.com/radar?id=1499403
694 'json/json_reader_unittest.cc', 694 'json/json_reader_unittest.cc',
695 'strings/string_piece_unittest.cc', 695 'strings/string_piece_unittest.cc',
696 696
697 # These tests crash when run with coverage turned on due to an 697 # These tests crash when run with coverage turned on due to an
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 ] 739 ]
740 }], 740 }],
741 ], 741 ],
742 'dependencies': [ 742 'dependencies': [
743 '../build/linux/system.gyp:glib', 743 '../build/linux/system.gyp:glib',
744 '../build/linux/system.gyp:ssl', 744 '../build/linux/system.gyp:ssl',
745 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 745 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
746 ], 746 ],
747 }, { # use_glib!=1 747 }, { # use_glib!=1
748 'sources!': [ 748 'sources!': [
749 'message_loop/message_pump_glib_unittest.cc', 749 'message_pump_glib_unittest.cc',
750 ] 750 ]
751 }], 751 }],
752 ['use_ozone == 1', { 752 ['use_ozone == 1', {
753 'sources!': [ 753 'sources!': [
754 'message_loop/message_pump_glib_unittest.cc', 754 'message_pump_glib_unittest.cc',
755 ] 755 ]
756 }], 756 }],
757 ['OS == "win"', { 757 ['OS == "win"', {
758 # This is needed to trigger the dll copy step on windows. 758 # This is needed to trigger the dll copy step on windows.
759 # TODO(mark): This should not be necessary. 759 # TODO(mark): This should not be necessary.
760 'dependencies': [ 760 'dependencies': [
761 '../third_party/icu/icu.gyp:icudata', 761 '../third_party/icu/icu.gyp:icudata',
762 ], 762 ],
763 'sources!': [ 763 'sources!': [
764 'file_descriptor_shuffle_unittest.cc', 764 'file_descriptor_shuffle_unittest.cc',
765 'files/dir_reader_posix_unittest.cc', 765 'files/dir_reader_posix_unittest.cc',
766 'threading/worker_pool_posix_unittest.cc', 766 'threading/worker_pool_posix_unittest.cc',
767 'message_loop/message_pump_libevent_unittest.cc', 767 'message_pump_libevent_unittest.cc',
768 ], 768 ],
769 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 769 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
770 'msvs_disabled_warnings': [ 770 'msvs_disabled_warnings': [
771 4267, 771 4267,
772 ], 772 ],
773 # This is needed so base_unittests uses the allocator shim, as 773 # This is needed so base_unittests uses the allocator shim, as
774 # SecurityTest.MemoryAllocationRestriction* tests are dependent 774 # SecurityTest.MemoryAllocationRestriction* tests are dependent
775 # on tcmalloc. 775 # on tcmalloc.
776 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into 776 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
777 # their own test suite. 777 # their own test suite.
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 'base_unittests.isolate', 1288 'base_unittests.isolate',
1289 ], 1289 ],
1290 'sources': [ 1290 'sources': [
1291 'base_unittests.isolate', 1291 'base_unittests.isolate',
1292 ], 1292 ],
1293 }, 1293 },
1294 ], 1294 ],
1295 }], 1295 }],
1296 ], 1296 ],
1297 } 1297 }
OLDNEW
« no previous file with comments | « trunk/src/base/android/base_jni_registrar.cc ('k') | trunk/src/base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698