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

Side by Side Diff: chrome/chrome_common.gypi

Issue 550423002: GN: Fix some breakage for os==chromeos build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address brett's brlapi comment Created 6 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
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | chrome/common/BUILD.gn » ('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 '../apps/app_shim/app_shim_launch.h', 9 '../apps/app_shim/app_shim_launch.h',
10 '../apps/app_shim/app_shim_messages.h', 10 '../apps/app_shim/app_shim_messages.h',
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 ], 467 ],
468 'dependencies': [ 468 'dependencies': [
469 '<(DEPTH)/components/components.gyp:dom_distiller_core', # Needed b y chrome_content_client.cc. 469 '<(DEPTH)/components/components.gyp:dom_distiller_core', # Needed b y chrome_content_client.cc.
470 ], 470 ],
471 }], 471 }],
472 ['enable_mdns == 1', { 472 ['enable_mdns == 1', {
473 'sources': [ 473 'sources': [
474 'common/local_discovery/local_discovery_messages.h', 474 'common/local_discovery/local_discovery_messages.h',
475 ] 475 ]
476 }], 476 }],
477 ['chromeos==1', {
478 'sources!': [
479 'common/chrome_version_info_linux.cc',
480 ],
481 }],
482 ['OS=="mac"', { 477 ['OS=="mac"', {
483 'dependencies': [ 478 'dependencies': [
484 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac', 479 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac',
485 '../third_party/mach_override/mach_override.gyp:mach_override', 480 '../third_party/mach_override/mach_override.gyp:mach_override',
486 ], 481 ],
487 'include_dirs': [ 482 'include_dirs': [
488 '<(DEPTH)/breakpad/src', 483 '<(DEPTH)/breakpad/src',
489 ], 484 ],
490 'sources!': [ 485 'sources!': [
491 'common/chrome_version_info_posix.cc', 486 'common/chrome_version_info_posix.cc',
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 'common/safe_browsing/csd.proto' 688 'common/safe_browsing/csd.proto'
694 ], 689 ],
695 'variables': { 690 'variables': {
696 'proto_in_dir': 'common/safe_browsing', 691 'proto_in_dir': 'common/safe_browsing',
697 'proto_out_dir': 'chrome/common/safe_browsing', 692 'proto_out_dir': 'chrome/common/safe_browsing',
698 }, 693 },
699 'includes': [ '../build/protoc.gypi' ], 694 'includes': [ '../build/protoc.gypi' ],
700 }, 695 },
701 ], 696 ],
702 } 697 }
OLDNEW
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698