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

Side by Side Diff: sync/sync.gyp

Issue 1089773003: Revert of Fix errors found in Mac gn component builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | « sync/BUILD.gn ('k') | third_party/sudden_motion_sensor/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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 'chromium_code': 1, 7 'chromium_code': 1,
8 # Setting these two variables allows other targets to use the 8 # Setting these two variables allows other targets to use the
9 # sync_proto_sources variable as the list of sync protocol buffer files. 9 # sync_proto_sources variable as the list of sync protocol buffer files.
10 'sync_proto_sources_dir': 'protocol', 10 'sync_proto_sources_dir': 'protocol',
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 'util/time.h', 454 'util/time.h',
455 ], 455 ],
456 456
457 'conditions': [ 457 'conditions': [
458 ['OS=="linux" and chromeos==1', { 458 ['OS=="linux" and chromeos==1', {
459 # Required by get_session_name.cc on Chrome OS. 459 # Required by get_session_name.cc on Chrome OS.
460 'dependencies': [ 460 'dependencies': [
461 '../chromeos/chromeos.gyp:chromeos', 461 '../chromeos/chromeos.gyp:chromeos',
462 ], 462 ],
463 }], 463 }],
464 ['OS=="mac"', {
465 'link_settings': {
466 'libraries': [
467 # Required by get_session_name_mac.mm on Mac.
468 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framewor k',
469 ]
470 },
471 }],
472 ], 464 ],
473 }, 465 },
474 { 466 {
475 # Contains sync protobuf definitions. Do not depend on this directly. 467 # Contains sync protobuf definitions. Do not depend on this directly.
476 # Depend on the 'sync' target to get the relevant C++ code, too. 468 # Depend on the 'sync' target to get the relevant C++ code, too.
477 # 469 #
478 # GN version: //sync/protocol 470 # GN version: //sync/protocol
479 'target_name': 'sync_proto', 471 'target_name': 'sync_proto',
480 'type': '<(component)', 472 'type': '<(component)',
481 'include_dirs': [ 473 'include_dirs': [
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 }, 514 },
523 'includes': [ 515 'includes': [
524 '../build/protoc.gypi' 516 '../build/protoc.gypi'
525 ], 517 ],
526 'defines': [ 518 'defines': [
527 'SYNC_IMPLEMENTATION' 519 'SYNC_IMPLEMENTATION'
528 ], 520 ],
529 }, 521 },
530 ], 522 ],
531 } 523 }
OLDNEW
« no previous file with comments | « sync/BUILD.gn ('k') | third_party/sudden_motion_sensor/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698