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

Side by Side Diff: chrome/chrome_common.gypi

Issue 1475883002: Revert of New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « chrome/chrome_child.gypi ('k') | chrome/chrome_debugger.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 '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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 ], 307 ],
308 'direct_dependent_settings': { 308 'direct_dependent_settings': {
309 'include_dirs': [ 309 'include_dirs': [
310 '..', 310 '..',
311 ], 311 ],
312 }, 312 },
313 'dependencies': [ 313 'dependencies': [
314 # TODO(gregoryd): chrome_resources and chrome_strings could be 314 # 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 315 # shared with the 64-bit target, but it does not work due to a gyp
316 # issue. 316 # issue.
317 'chrome_common_features',
318 'installer_util', 317 'installer_util',
319 'safe_browsing_proto', 318 'safe_browsing_proto',
320 '<(DEPTH)/base/base.gyp:base', 319 '<(DEPTH)/base/base.gyp:base',
321 '<(DEPTH)/base/base.gyp:base_i18n', 320 '<(DEPTH)/base/base.gyp:base_i18n',
322 '<(DEPTH)/base/base.gyp:base_prefs', 321 '<(DEPTH)/base/base.gyp:base_prefs',
323 '<(DEPTH)/base/base.gyp:base_static', 322 '<(DEPTH)/base/base.gyp:base_static',
324 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', 323 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
325 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', 324 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
326 '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources', 325 '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
327 '<(DEPTH)/chrome/common_constants.gyp:common_constants', 326 '<(DEPTH)/chrome/common_constants.gyp:common_constants',
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 'type': 'static_library', 557 'type': 'static_library',
559 'sources': [ 558 'sources': [
560 'common/net/net_resource_provider.cc', 559 'common/net/net_resource_provider.cc',
561 'common/net/net_resource_provider.h', 560 'common/net/net_resource_provider.h',
562 'common/net/x509_certificate_model.cc', 561 'common/net/x509_certificate_model.cc',
563 'common/net/x509_certificate_model.h', 562 'common/net/x509_certificate_model.h',
564 'common/net/x509_certificate_model_nss.cc', 563 'common/net/x509_certificate_model_nss.cc',
565 'common/net/x509_certificate_model_openssl.cc', 564 'common/net/x509_certificate_model_openssl.cc',
566 ], 565 ],
567 'dependencies': [ 566 'dependencies': [
568 'chrome_common_features',
569 '<(DEPTH)/base/base.gyp:base', 567 '<(DEPTH)/base/base.gyp:base',
570 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', 568 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
571 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', 569 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
572 '<(DEPTH)/components/url_formatter/url_formatter.gyp:url_formatter', 570 '<(DEPTH)/components/url_formatter/url_formatter.gyp:url_formatter',
573 '<(DEPTH)/crypto/crypto.gyp:crypto', 571 '<(DEPTH)/crypto/crypto.gyp:crypto',
574 '<(DEPTH)/net/net.gyp:net', 572 '<(DEPTH)/net/net.gyp:net',
575 '<(DEPTH)/net/net.gyp:net_resources', 573 '<(DEPTH)/net/net.gyp:net_resources',
576 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 574 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
577 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 575 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
578 '<(DEPTH)/ui/base/ui_base.gyp:ui_base', 576 '<(DEPTH)/ui/base/ui_base.gyp:ui_base',
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 '../third_party/mojo/mojom_bindings_generator.gypi' 646 '../third_party/mojo/mojom_bindings_generator.gypi'
649 ], 647 ],
650 'sources': [ 648 'sources': [
651 'common/resource_usage_reporter.mojom', 649 'common/resource_usage_reporter.mojom',
652 ], 650 ],
653 'dependencies': [ 651 'dependencies': [
654 '../mojo/mojo_base.gyp:mojo_environment_chromium', 652 '../mojo/mojo_base.gyp:mojo_environment_chromium',
655 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 653 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
656 ], 654 ],
657 }, 655 },
658 {
659 # GN version: //chrome/common:features
660 'target_name': 'chrome_common_features',
661 'includes': [ '../build/buildflag_header.gypi' ],
662 'variables': {
663 'buildflag_header_path': 'chrome/common/features.h',
664 'buildflag_flags': [
665 'ENABLE_GOOGLE_NOW=<(enable_google_now)',
666 ],
667 },
668 },
669 ], 656 ],
670 } 657 }
OLDNEW
« no previous file with comments | « chrome/chrome_child.gypi ('k') | chrome/chrome_debugger.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698