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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 9699054: rlz: Hook up on mac, switch to chrome's network stack on win. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: last test should pass Created 8 years, 9 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 | Annotate | Revision Log
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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 4585 matching lines...) Expand 10 before | Expand all | Expand 10 after
4596 ], 4596 ],
4597 'outputs': [ 4597 'outputs': [
4598 '<(INTERMEDIATE_DIR)/ui_localizer_table.h', 4598 '<(INTERMEDIATE_DIR)/ui_localizer_table.h',
4599 ], 4599 ],
4600 'action': ['<(xib_localizer_tool_path)', 4600 'action': ['<(xib_localizer_tool_path)',
4601 '<@(_outputs)', 4601 '<@(_outputs)',
4602 '<@(xib_files_to_scan)'], 4602 '<@(xib_files_to_scan)'],
4603 }, 4603 },
4604 ], 4604 ],
4605 }], 4605 }],
4606 ['OS=="win" or OS=="mac"', {
Mark Mentovai 2012/03/26 19:52:18 Only for official builds, right?
Nico 2012/03/26 20:26:57 No, surprisingly not. Chrome-the-browser only send
4607 'dependencies': [
4608 '../rlz/rlz.gyp:rlz_lib',
Mark Mentovai 2012/03/26 20:30:01 According to this, RLZ bits are indeed included in
4609 ],
4610 }, { # 'OS!="win" and OS!="mac"
4611 'sources/': [
4612 # Exclude all of rlz.
4613 ['exclude', '^browser/rlz/'],
4614 ],
4615 }],
4606 ['OS=="win"', { 4616 ['OS=="win"', {
4607 'include_dirs': [ 4617 'include_dirs': [
4608 '<(DEPTH)/third_party/wtl/include', 4618 '<(DEPTH)/third_party/wtl/include',
4609 ], 4619 ],
4610 'dependencies': [ 4620 'dependencies': [
4611 '../google_update/google_update.gyp:google_update', 4621 '../google_update/google_update.gyp:google_update',
4612 '../rlz/rlz.gyp:rlz_lib',
4613 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 4622 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
4614 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 4623 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
4615 '../ui/views/views.gyp:views', 4624 '../ui/views/views.gyp:views',
4616 ], 4625 ],
4617 'export_dependent_settings': [ 4626 'export_dependent_settings': [
4618 '../ui/views/views.gyp:views', 4627 '../ui/views/views.gyp:views',
4619 ], 4628 ],
4620 'sources': [ 4629 'sources': [
4621 # Using built-in rule in vstudio for midl. 4630 # Using built-in rule in vstudio for midl.
4622 'browser/history/history_indexer.idl', 4631 'browser/history/history_indexer.idl',
(...skipping 24 matching lines...) Expand all
4647 }], 4656 }],
4648 ], 4657 ],
4649 }, { # 'OS!="win" 4658 }, { # 'OS!="win"
4650 'sources/': [ 4659 'sources/': [
4651 # Exclude all of hang_monitor. 4660 # Exclude all of hang_monitor.
4652 ['exclude', '^browser/hang_monitor/'], 4661 ['exclude', '^browser/hang_monitor/'],
4653 4662
4654 # Exclude parts of password_manager. 4663 # Exclude parts of password_manager.
4655 ['exclude', '^browser/password_manager/ie7_password\\.cc$'], 4664 ['exclude', '^browser/password_manager/ie7_password\\.cc$'],
4656 4665
4657 # Exclude all of rlz.
4658 ['exclude', '^browser/rlz/'],
4659 ['exclude', '^browser/extensions/extension_rlz_module'],
4660
4661 # Exclude all of views. 4666 # Exclude all of views.
4662 ['exclude', '^browser/ui/views/'], 4667 ['exclude', '^browser/ui/views/'],
4663 4668
4664 # Exclude try chrome dialog. 4669 # Exclude try chrome dialog.
4665 ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'], 4670 ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'],
4666 ['exclude', '^browser/first_run/try_chrome_dialog_view.h'], 4671 ['exclude', '^browser/first_run/try_chrome_dialog_view.h'],
4667 ], 4672 ],
4668 'conditions': [ 4673 'conditions': [
4669 ['use_aura==1',{ 4674 ['use_aura==1',{
4670 'sources/': [ 4675 'sources/': [
(...skipping 14 matching lines...) Expand all
4685 '../ui/views/views.gyp:views', 4690 '../ui/views/views.gyp:views',
4686 ], 4691 ],
4687 'include_dirs': [ 4692 'include_dirs': [
4688 '<(INTERMEDIATE_DIR)', 4693 '<(INTERMEDIATE_DIR)',
4689 '<(INTERMEDIATE_DIR)/chrome', 4694 '<(INTERMEDIATE_DIR)/chrome',
4690 ], 4695 ],
4691 'sources/': [ 4696 'sources/': [
4692 # This exclude duplicates the one just above because of the 4697 # This exclude duplicates the one just above because of the
4693 # order of evaluation of the 'sources/' rule above, the 4698 # order of evaluation of the 'sources/' rule above, the
4694 # conditions, and this 'sources/' rule. 4699 # conditions, and this 'sources/' rule.
4695 ['exclude', '^browser/extensions/extension_rlz_module'],
4696 ['exclude', '^browser/google/google_update.cc'], 4700 ['exclude', '^browser/google/google_update.cc'],
4697 ['exclude', '^browser/google/google_update.h'], 4701 ['exclude', '^browser/google/google_update.h'],
4698 ['exclude', '^browser/platform_util_common_linux.cc'], 4702 ['exclude', '^browser/platform_util_common_linux.cc'],
4699 ['include', 'browser/printing/print_dialog_cloud.cc'], 4703 ['include', 'browser/printing/print_dialog_cloud.cc'],
4700 ['include', 'browser/printing/print_dialog_cloud.h'], 4704 ['include', 'browser/printing/print_dialog_cloud.h'],
4701 ['include', '^browser/speech/speech_recognition_bubble_views.cc' ], 4705 ['include', '^browser/speech/speech_recognition_bubble_views.cc' ],
4702 ['include', '^browser/ui/tabs/dock_info.cc'], 4706 ['include', '^browser/ui/tabs/dock_info.cc'],
4703 ['include', '^browser/ui/tabs/dock_info.h'], 4707 ['include', '^browser/ui/tabs/dock_info.h'],
4704 ['include', '^browser/ui/views/about_chrome_view.cc'], 4708 ['include', '^browser/ui/views/about_chrome_view.cc'],
4705 ['include', '^browser/ui/views/about_chrome_view.h'], 4709 ['include', '^browser/ui/views/about_chrome_view.h'],
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
5151 'variables': { 5155 'variables': {
5152 'proto_in_dir': '../third_party/cros_system_api/dbus/', 5156 'proto_in_dir': '../third_party/cros_system_api/dbus/',
5153 'proto_out_dir': 'chrome/browser/chromeos/dbus', 5157 'proto_out_dir': 'chrome/browser/chromeos/dbus',
5154 }, 5158 },
5155 'includes': ['../build/protoc.gypi'], 5159 'includes': ['../build/protoc.gypi'],
5156 }], 5160 }],
5157 ], 5161 ],
5158 }, 5162 },
5159 ], 5163 ],
5160 } 5164 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698