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

Side by Side Diff: base/base.gyp

Issue 113938: Readd the gmock unittest example from the build as it causes link errors in XP Modules. (Closed)
Patch Set: Created 11 years, 7 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
« no previous file with comments | « no previous file | no next file » | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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/common.gypi', 10 '../build/common.gypi',
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 'directory_watcher_unittest.cc', 601 'directory_watcher_unittest.cc',
602 'field_trial_unittest.cc', 602 'field_trial_unittest.cc',
603 'file_descriptor_shuffle_unittest.cc', 603 'file_descriptor_shuffle_unittest.cc',
604 'file_path_unittest.cc', 604 'file_path_unittest.cc',
605 'file_util_unittest.cc', 605 'file_util_unittest.cc',
606 'file_version_info_unittest.cc', 606 'file_version_info_unittest.cc',
607 'gfx/jpeg_codec_unittest.cc', 607 'gfx/jpeg_codec_unittest.cc',
608 'gfx/native_theme_unittest.cc', 608 'gfx/native_theme_unittest.cc',
609 'gfx/png_codec_unittest.cc', 609 'gfx/png_codec_unittest.cc',
610 'gfx/rect_unittest.cc', 610 'gfx/rect_unittest.cc',
611 'gmock_unittest.cc',
611 'histogram_unittest.cc', 612 'histogram_unittest.cc',
612 'hmac_unittest.cc', 613 'hmac_unittest.cc',
613 'idletimer_unittest.cc', 614 'idletimer_unittest.cc',
614 'json_reader_unittest.cc', 615 'json_reader_unittest.cc',
615 'json_writer_unittest.cc', 616 'json_writer_unittest.cc',
616 'lazy_instance_unittest.cc', 617 'lazy_instance_unittest.cc',
617 'linked_ptr_unittest.cc', 618 'linked_ptr_unittest.cc',
618 'mac_util_unittest.cc', 619 'mac_util_unittest.cc',
619 'message_loop_unittest.cc', 620 'message_loop_unittest.cc',
620 'object_watcher_unittest.cc', 621 'object_watcher_unittest.cc',
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 ], 667 ],
667 'include_dirs': [ 668 'include_dirs': [
668 # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU 669 # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU
669 # #include for unicode/uchar.h. This should probably be cleaned up. 670 # #include for unicode/uchar.h. This should probably be cleaned up.
670 '../third_party/icu38/public/common', 671 '../third_party/icu38/public/common',
671 ], 672 ],
672 'dependencies': [ 673 'dependencies': [
673 'base', 674 'base',
674 'base_gfx', 675 'base_gfx',
675 '../skia/skia.gyp:skia', 676 '../skia/skia.gyp:skia',
677 '../testing/gmock.gyp:gmock',
676 '../testing/gtest.gyp:gtest', 678 '../testing/gtest.gyp:gtest',
677 ], 679 ],
678 'conditions': [ 680 'conditions': [
679 ['OS == "linux"', { 681 ['OS == "linux"', {
680 'sources!': [ 682 'sources!': [
681 'file_version_info_unittest.cc', 683 'file_version_info_unittest.cc',
682 # Linux has an implementation of idle_timer, but it's unclear 684 # Linux has an implementation of idle_timer, but it's unclear
683 # if we want it yet, so leave it 'unported' for now. 685 # if we want it yet, so leave it 'unported' for now.
684 'idletimer_unittest.cc', 686 'idletimer_unittest.cc',
685 'worker_pool_linux_unittest.cc', 687 'worker_pool_linux_unittest.cc',
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 'msvs_settings': { 763 'msvs_settings': {
762 'VCLinkerTool': { 764 'VCLinkerTool': {
763 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 765 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
764 }, 766 },
765 }, 767 },
766 }, 768 },
767 ], 769 ],
768 }], 770 }],
769 ], 771 ],
770 } 772 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698