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

Side by Side Diff: trunk/src/chrome/chrome_common.gypi

Issue 23766011: Revert 221380 "Use Finch to compare the performances of CLD1 and..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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/build/common.gypi ('k') | trunk/src/chrome/chrome_dll.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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'common', 8 'target_name': 'common',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 10 'variables': {
11 'chrome_common_target': 1, 11 'chrome_common_target': 1,
12 'enable_wexit_time_destructors': 1, 12 'enable_wexit_time_destructors': 1,
13 }, 13 },
14 'include_dirs': [ 14 'include_dirs': [
15 '..', 15 '..',
16 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_content_client.cc. 16 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_content_client.cc.
17 ], 17 ],
18 'direct_dependent_settings': { 18 'direct_dependent_settings': {
19 'include_dirs': [ 19 'include_dirs': [
20 '..', 20 '..',
21 ], 21 ],
22 }, 22 },
23 'dependencies': [ 23 'dependencies': [
24 # TODO(gregoryd): chrome_resources and chrome_strings could be 24 # TODO(gregoryd): chrome_resources and chrome_strings could be
25 # shared with the 64-bit target, but it does not work due to a gyp 25 # shared with the 64-bit target, but it does not work due to a gyp
26 # issue. 26 # issue.
27 '../third_party/cld/cld.gyp:cld',
27 'common_net', 28 'common_net',
28 'common_version', 29 'common_version',
29 'installer_util', 30 'installer_util',
30 'metrics_proto', 31 'metrics_proto',
31 '<(DEPTH)/base/base.gyp:base', 32 '<(DEPTH)/base/base.gyp:base',
32 '<(DEPTH)/base/base.gyp:base_i18n', 33 '<(DEPTH)/base/base.gyp:base_i18n',
33 '<(DEPTH)/base/base.gyp:base_prefs', 34 '<(DEPTH)/base/base.gyp:base_prefs',
34 '<(DEPTH)/base/base.gyp:base_static', 35 '<(DEPTH)/base/base.gyp:base_static',
35 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', 36 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
36 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', 37 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 'sources!': [ 660 'sources!': [
660 'common/media/webrtc_logging_messages.h', 661 'common/media/webrtc_logging_messages.h',
661 ] 662 ]
662 }], 663 }],
663 ['enable_printing==0', { 664 ['enable_printing==0', {
664 'sources!': [ 665 'sources!': [
665 'common/print_messages.cc', 666 'common/print_messages.cc',
666 'common/print_messages.h', 667 'common/print_messages.h',
667 ] 668 ]
668 }], 669 }],
669 ['cld_version==0 or cld_version==1', {
670 'dependencies': [
671 '<(DEPTH)/third_party/cld/cld.gyp:cld',
672 ],
673 }],
674 ['cld_version==0 or cld_version==2', {
675 'dependencies': [
676 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2',
677 ],
678 }],
679 ], 670 ],
680 'target_conditions': [ 671 'target_conditions': [
681 ['OS == "ios"', { 672 ['OS == "ios"', {
682 'sources/': [ 673 'sources/': [
683 # Pull in specific Mac files for iOS (which have been filtered out 674 # Pull in specific Mac files for iOS (which have been filtered out
684 # by file name rules). 675 # by file name rules).
685 ['include', '^common/chrome_version_info_mac\\.mm$'], 676 ['include', '^common/chrome_version_info_mac\\.mm$'],
686 ['include', '^common/mac/nscoder_util\\.'], 677 ['include', '^common/mac/nscoder_util\\.'],
687 ], 678 ],
688 }], 679 }],
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 'common/metrics/proto/user_action_event.proto', 851 'common/metrics/proto/user_action_event.proto',
861 ], 852 ],
862 'variables': { 853 'variables': {
863 'proto_in_dir': 'common/metrics/proto', 854 'proto_in_dir': 'common/metrics/proto',
864 'proto_out_dir': 'chrome/common/metrics/proto', 855 'proto_out_dir': 'chrome/common/metrics/proto',
865 }, 856 },
866 'includes': [ '../build/protoc.gypi' ], 857 'includes': [ '../build/protoc.gypi' ],
867 }, 858 },
868 ], 859 ],
869 } 860 }
OLDNEW
« no previous file with comments | « trunk/src/build/common.gypi ('k') | trunk/src/chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698