| OLD | NEW |
| 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 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 ['use_system_nspr==1', { | 646 ['use_system_nspr==1', { |
| 646 'dependencies': [ | 647 'dependencies': [ |
| 647 '<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr', | 648 '<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr', |
| 648 ], | 649 ], |
| 649 }], | 650 }], |
| 650 ['enable_webrtc==0', { | 651 ['enable_webrtc==0', { |
| 651 'sources!': [ | 652 'sources!': [ |
| 652 'common/media/webrtc_logging_messages.h', | 653 'common/media/webrtc_logging_messages.h', |
| 653 ] | 654 ] |
| 654 }], | 655 }], |
| 655 ['enable_language_detection==1', { | |
| 656 'dependencies': [ | |
| 657 '../third_party/cld/cld.gyp:cld', | |
| 658 ], | |
| 659 }], | |
| 660 ], | 656 ], |
| 661 'target_conditions': [ | 657 'target_conditions': [ |
| 662 ['OS == "ios"', { | 658 ['OS == "ios"', { |
| 663 'sources/': [ | 659 'sources/': [ |
| 664 # Pull in specific Mac files for iOS (which have been filtered out | 660 # Pull in specific Mac files for iOS (which have been filtered out |
| 665 # by file name rules). | 661 # by file name rules). |
| 666 ['include', '^common/chrome_version_info_mac\\.mm$'], | 662 ['include', '^common/chrome_version_info_mac\\.mm$'], |
| 667 ['include', '^common/mac/nscoder_util\\.'], | 663 ['include', '^common/mac/nscoder_util\\.'], |
| 668 ], | 664 ], |
| 669 }], | 665 }], |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 839 'common/metrics/proto/user_action_event.proto', | 835 'common/metrics/proto/user_action_event.proto', |
| 840 ], | 836 ], |
| 841 'variables': { | 837 'variables': { |
| 842 'proto_in_dir': 'common/metrics/proto', | 838 'proto_in_dir': 'common/metrics/proto', |
| 843 'proto_out_dir': 'chrome/common/metrics/proto', | 839 'proto_out_dir': 'chrome/common/metrics/proto', |
| 844 }, | 840 }, |
| 845 'includes': [ '../build/protoc.gypi' ], | 841 'includes': [ '../build/protoc.gypi' ], |
| 846 }, | 842 }, |
| 847 ], | 843 ], |
| 848 } | 844 } |
| OLD | NEW |