| 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 'variables': { | 6 'variables': { |
| 7 # File lists shared with GN build. | 7 # File lists shared with GN build. |
| 8 'chrome_common_sources': [ | 8 'chrome_common_sources': [ |
| 9 'common/all_messages.h', | 9 'common/all_messages.h', |
| 10 'common/attrition_experiments.h', | 10 'common/attrition_experiments.h', |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 'chrome_common_mac_sources': [ | 290 'chrome_common_mac_sources': [ |
| 291 'common/media_galleries/iphoto_library.cc', | 291 'common/media_galleries/iphoto_library.cc', |
| 292 'common/media_galleries/iphoto_library.h', | 292 'common/media_galleries/iphoto_library.h', |
| 293 ] | 293 ] |
| 294 }, | 294 }, |
| 295 'targets': [ | 295 'targets': [ |
| 296 { | 296 { |
| 297 # GN: //chrome/common:common | 297 # GN: //chrome/common:common |
| 298 'target_name': 'common', | 298 'target_name': 'common', |
| 299 'type': 'static_library', | 299 'type': 'static_library', |
| 300 'hard_dependency': 1, # Because of transitive dep on version_header. |
| 300 'variables': { | 301 'variables': { |
| 301 'chrome_common_target': 1, | 302 'chrome_common_target': 1, |
| 302 'enable_wexit_time_destructors': 1, | 303 'enable_wexit_time_destructors': 1, |
| 303 }, | 304 }, |
| 304 'include_dirs': [ | 305 'include_dirs': [ |
| 305 '..', | 306 '..', |
| 306 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_content_client.cc. | 307 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_content_client.cc. |
| 307 ], | 308 ], |
| 308 'direct_dependent_settings': { | 309 'direct_dependent_settings': { |
| 309 'include_dirs': [ | 310 'include_dirs': [ |
| 310 '..', | 311 '..', |
| 311 ], | 312 ], |
| 312 }, | 313 }, |
| 313 'dependencies': [ | 314 'dependencies': [ |
| 314 # TODO(gregoryd): chrome_resources and chrome_strings could be | 315 # TODO(gregoryd): chrome_resources and chrome_strings could be |
| 315 # shared with the 64-bit target, but it does not work due to a gyp | 316 # shared with the 64-bit target, but it does not work due to a gyp |
| 316 # issue. | 317 # issue. |
| 318 'chrome_common_features', |
| 317 'installer_util', | 319 'installer_util', |
| 318 'safe_browsing_proto', | 320 'safe_browsing_proto', |
| 319 '<(DEPTH)/base/base.gyp:base', | 321 '<(DEPTH)/base/base.gyp:base', |
| 320 '<(DEPTH)/base/base.gyp:base_i18n', | 322 '<(DEPTH)/base/base.gyp:base_i18n', |
| 321 '<(DEPTH)/base/base.gyp:base_prefs', | 323 '<(DEPTH)/base/base.gyp:base_prefs', |
| 322 '<(DEPTH)/base/base.gyp:base_static', | 324 '<(DEPTH)/base/base.gyp:base_static', |
| 323 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', | 325 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', |
| 324 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', | 326 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', |
| 325 '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources', | 327 '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources', |
| 326 '<(DEPTH)/chrome/common_constants.gyp:common_constants', | 328 '<(DEPTH)/chrome/common_constants.gyp:common_constants', |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 'type': 'static_library', | 559 'type': 'static_library', |
| 558 'sources': [ | 560 'sources': [ |
| 559 'common/net/net_resource_provider.cc', | 561 'common/net/net_resource_provider.cc', |
| 560 'common/net/net_resource_provider.h', | 562 'common/net/net_resource_provider.h', |
| 561 'common/net/x509_certificate_model.cc', | 563 'common/net/x509_certificate_model.cc', |
| 562 'common/net/x509_certificate_model.h', | 564 'common/net/x509_certificate_model.h', |
| 563 'common/net/x509_certificate_model_nss.cc', | 565 'common/net/x509_certificate_model_nss.cc', |
| 564 'common/net/x509_certificate_model_openssl.cc', | 566 'common/net/x509_certificate_model_openssl.cc', |
| 565 ], | 567 ], |
| 566 'dependencies': [ | 568 'dependencies': [ |
| 569 'chrome_common_features', |
| 567 '<(DEPTH)/base/base.gyp:base', | 570 '<(DEPTH)/base/base.gyp:base', |
| 568 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', | 571 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', |
| 569 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', | 572 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', |
| 570 '<(DEPTH)/components/url_formatter/url_formatter.gyp:url_formatter', | 573 '<(DEPTH)/components/url_formatter/url_formatter.gyp:url_formatter', |
| 571 '<(DEPTH)/crypto/crypto.gyp:crypto', | 574 '<(DEPTH)/crypto/crypto.gyp:crypto', |
| 572 '<(DEPTH)/net/net.gyp:net', | 575 '<(DEPTH)/net/net.gyp:net', |
| 573 '<(DEPTH)/net/net.gyp:net_resources', | 576 '<(DEPTH)/net/net.gyp:net_resources', |
| 574 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', | 577 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', |
| 575 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', | 578 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', |
| 576 '<(DEPTH)/ui/base/ui_base.gyp:ui_base', | 579 '<(DEPTH)/ui/base/ui_base.gyp:ui_base', |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 646 '../third_party/mojo/mojom_bindings_generator.gypi' | 649 '../third_party/mojo/mojom_bindings_generator.gypi' |
| 647 ], | 650 ], |
| 648 'sources': [ | 651 'sources': [ |
| 649 'common/resource_usage_reporter.mojom', | 652 'common/resource_usage_reporter.mojom', |
| 650 ], | 653 ], |
| 651 'dependencies': [ | 654 'dependencies': [ |
| 652 '../mojo/mojo_base.gyp:mojo_environment_chromium', | 655 '../mojo/mojo_base.gyp:mojo_environment_chromium', |
| 653 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', | 656 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', |
| 654 ], | 657 ], |
| 655 }, | 658 }, |
| 659 { |
| 660 # GN version: //chrome/common:features |
| 661 'target_name': 'chrome_common_features', |
| 662 'includes': [ '../build/buildflag_header.gypi' ], |
| 663 'variables': { |
| 664 'buildflag_header_path': 'chrome/common/features.h', |
| 665 'buildflag_flags': [ |
| 666 'ENABLE_GOOGLE_NOW=<(enable_google_now)', |
| 667 ], |
| 668 }, |
| 669 }, |
| 656 ], | 670 ], |
| 657 } | 671 } |
| OLD | NEW |