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

Side by Side Diff: remoting/remoting_host.gypi

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase Created 4 years, 10 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 | « remoting/host/BUILD.gn ('k') | remoting/remoting_test.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'includes': [ 6 'includes': [
7 'remoting_enable.gypi', 7 'remoting_enable.gypi',
8 ], 8 ],
9 9
10 'conditions': [ 10 'conditions': [
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 'target_name': 'remoting_start_host', 324 'target_name': 'remoting_start_host',
325 'type': 'executable', 325 'type': 'executable',
326 'dependencies': [ 326 'dependencies': [
327 'remoting_host_setup_base', 327 'remoting_host_setup_base',
328 ], 328 ],
329 'sources': [ 329 'sources': [
330 'host/setup/host_starter.cc', 330 'host/setup/host_starter.cc',
331 'host/setup/host_starter.h', 331 'host/setup/host_starter.h',
332 'host/setup/start_host.cc', 332 'host/setup/start_host.cc',
333 ], 333 ],
334 'conditions': [
335 ['OS=="linux" and use_allocator!="none"', {
336 'dependencies': [
337 '../base/allocator/allocator.gyp:allocator',
338 ],
339 }],
340 ],
341 }, # end of target 'remoting_start_host' 334 }, # end of target 'remoting_start_host'
342 { 335 {
343 # GN: //remoting/host:remoting_infoplist_strings 336 # GN: //remoting/host:remoting_infoplist_strings
344 'target_name': 'remoting_infoplist_strings', 337 'target_name': 'remoting_infoplist_strings',
345 'type': 'none', 338 'type': 'none',
346 'dependencies': [ 339 'dependencies': [
347 'remoting_resources', 340 'remoting_resources',
348 ], 341 ],
349 'sources': [ 342 'sources': [
350 'host/remoting_me2me_host-InfoPlist.strings.jinja2', 343 'host/remoting_me2me_host-InfoPlist.strings.jinja2',
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 }, 531 },
539 'action': [ 532 'action': [
540 '<(dump_product_syms_path)', 533 '<(dump_product_syms_path)',
541 '<(version_full)', 534 '<(version_full)',
542 ], 535 ],
543 }, # end of postbuild 'dump_symbols' 536 }, # end of postbuild 'dump_symbols'
544 ], # end of 'postbuilds' 537 ], # end of 'postbuilds'
545 }], # mac_breakpad==1 538 }], # mac_breakpad==1
546 ], # conditions 539 ], # conditions
547 }], # OS=mac 540 }], # OS=mac
548 ['OS=="linux" and use_allocator!="none"', {
549 'dependencies': [
550 '../base/allocator/allocator.gyp:allocator',
551 ],
552 }], # OS=linux
553 ], # end of 'conditions' 541 ], # end of 'conditions'
554 }, # end of target 'remoting_me2me_host' 542 }, # end of target 'remoting_me2me_host'
555 { 543 {
556 # GN: //remoting/host:native_messaging_host 544 # GN: //remoting/host:native_messaging_host
557 'target_name': 'remoting_me2me_native_messaging_host', 545 'target_name': 'remoting_me2me_native_messaging_host',
558 'type': 'executable', 546 'type': 'executable',
559 'product_name': 'native_messaging_host', 547 'product_name': 'native_messaging_host',
560 'variables': { 'enable_wexit_time_destructors': 1, }, 548 'variables': { 'enable_wexit_time_destructors': 1, },
561 'dependencies': [ 549 'dependencies': [
562 '../base/base.gyp:base', 550 '../base/base.gyp:base',
563 'remoting_breakpad', 551 'remoting_breakpad',
564 'remoting_host', 552 'remoting_host',
565 'remoting_host_setup_base', 553 'remoting_host_setup_base',
566 'remoting_infoplist_strings', 554 'remoting_infoplist_strings',
567 'remoting_native_messaging_base', 555 'remoting_native_messaging_base',
568 ], 556 ],
569 'defines': [ 557 'defines': [
570 'VERSION=<(version_full)', 558 'VERSION=<(version_full)',
571 ], 559 ],
572 'sources': [ 560 'sources': [
573 'host/setup/me2me_native_messaging_host_entry_point.cc', 561 'host/setup/me2me_native_messaging_host_entry_point.cc',
574 'host/setup/me2me_native_messaging_host_main.cc', 562 'host/setup/me2me_native_messaging_host_main.cc',
575 'host/setup/me2me_native_messaging_host_main.h', 563 'host/setup/me2me_native_messaging_host_main.h',
576 ], 564 ],
577 'conditions': [ 565 'conditions': [
578 ['OS=="linux" and use_allocator!="none"', {
579 'dependencies': [
580 '../base/allocator/allocator.gyp:allocator',
581 ],
582 }],
583 ['OS=="mac"', { 566 ['OS=="mac"', {
584 'mac_bundle': 1, 567 'mac_bundle': 1,
585 'variables': { 568 'variables': {
586 'host_bundle_id': '<!(python <(version_py_path) -f <(branding_p ath) -t "@MAC_NATIVE_MESSAGING_HOST_BUNDLE_ID@")', 569 'host_bundle_id': '<!(python <(version_py_path) -f <(branding_p ath) -t "@MAC_NATIVE_MESSAGING_HOST_BUNDLE_ID@")',
587 }, 570 },
588 'xcode_settings': { 571 'xcode_settings': {
589 'INFOPLIST_FILE': 'host/setup/native_messaging_host-Info.plist', 572 'INFOPLIST_FILE': 'host/setup/native_messaging_host-Info.plist',
590 'INFOPLIST_PREPROCESS': 'YES', 573 'INFOPLIST_PREPROCESS': 'YES',
591 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_f ull)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)"', 574 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_f ull)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)"',
592 }, 575 },
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 'host/it2me/it2me_native_messaging_host_main.cc', 651 'host/it2me/it2me_native_messaging_host_main.cc',
669 'host/it2me/it2me_native_messaging_host_main.h', 652 'host/it2me/it2me_native_messaging_host_main.h',
670 ], 653 ],
671 'conditions': [ 654 'conditions': [
672 ['OS=="linux" and chromeos==0 and use_ozone==0', { 655 ['OS=="linux" and chromeos==0 and use_ozone==0', {
673 'dependencies': [ 656 'dependencies': [
674 # Always use GTK on Linux, even for Aura builds. 657 # Always use GTK on Linux, even for Aura builds.
675 '../build/linux/system.gyp:gtk2', 658 '../build/linux/system.gyp:gtk2',
676 ], 659 ],
677 }], 660 }],
678 ['OS=="linux" and use_allocator!="none"', {
679 'dependencies': [
680 '../base/allocator/allocator.gyp:allocator',
681 ],
682 }],
683 ['OS=="mac"', { 661 ['OS=="mac"', {
684 'mac_bundle': 1, 662 'mac_bundle': 1,
685 'variables': { 663 'variables': {
686 'host_bundle_id': '<!(python <(version_py_path) -f <(brandin g_path) -t "@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_ID@")', 664 'host_bundle_id': '<!(python <(version_py_path) -f <(brandin g_path) -t "@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_ID@")',
687 }, 665 },
688 'xcode_settings': { 666 'xcode_settings': {
689 'INFOPLIST_FILE': 'host/it2me/remote_assistance_host-Info.pl ist', 667 'INFOPLIST_FILE': 'host/it2me/remote_assistance_host-Info.pl ist',
690 'INFOPLIST_PREPROCESS': 'YES', 668 'INFOPLIST_PREPROCESS': 'YES',
691 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(versi on_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)"', 669 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(versi on_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)"',
692 }, 670 },
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 # Dummy target for chromeos==1 725 # Dummy target for chromeos==1
748 'target_name': 'remoting_it2me_native_messaging_host', 726 'target_name': 'remoting_it2me_native_messaging_host',
749 'type': 'executable', 727 'type': 'executable',
750 }, 728 },
751 ], # targets 729 ], # targets
752 }], # end of chromeos==0 730 }], # end of chromeos==0
753 ], # end of conditions 731 ], # end of conditions
754 }], # end of OS!="win" and enable_remoting_host==1 732 }], # end of OS!="win" and enable_remoting_host==1
755 ], # end of 'conditions' 733 ], # end of 'conditions'
756 } 734 }
OLDNEW
« no previous file with comments | « remoting/host/BUILD.gn ('k') | remoting/remoting_test.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698