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

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

Issue 18770006: Remove USE_LINUX_BREAKPAD ifdef since we don't need it for chromium anymore. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: android build fix per cjhopman Created 7 years, 5 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 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser_chromeos', 9 'target_name': 'browser_chromeos',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 26 matching lines...) Expand all
37 'contacts_proto', 37 'contacts_proto',
38 'debugger', 38 'debugger',
39 'device_policy_proto', 39 'device_policy_proto',
40 'drive_proto', 40 'drive_proto',
41 'feedback_proto', 41 'feedback_proto',
42 'in_memory_url_index_cache_proto', 42 'in_memory_url_index_cache_proto',
43 'installer_util', 43 'installer_util',
44 'safe_browsing_proto', 44 'safe_browsing_proto',
45 'safe_browsing_report_proto', 45 'safe_browsing_report_proto',
46 'variations_seed_proto', 46 'variations_seed_proto',
47 '../breakpad/breakpad.gyp:breakpad_client',
47 '../build/linux/system.gyp:dbus', 48 '../build/linux/system.gyp:dbus',
48 '../chromeos/chromeos.gyp:chromeos', 49 '../chromeos/chromeos.gyp:chromeos',
49 '../chromeos/chromeos.gyp:chromeos_memory', 50 '../chromeos/chromeos.gyp:chromeos_memory',
50 # browser_chromeos #includes power_supply_properties.pb.h directly. 51 # browser_chromeos #includes power_supply_properties.pb.h directly.
51 '../chromeos/chromeos.gyp:power_manager_proto', 52 '../chromeos/chromeos.gyp:power_manager_proto',
52 '../chromeos/ime/input_method.gyp:gencode', 53 '../chromeos/ime/input_method.gyp:gencode',
53 '../content/content.gyp:content_browser', 54 '../content/content.gyp:content_browser',
54 '../content/content.gyp:content_common', 55 '../content/content.gyp:content_common',
55 '../crypto/crypto.gyp:crypto', 56 '../crypto/crypto.gyp:crypto',
56 '../dbus/dbus.gyp:dbus', 57 '../dbus/dbus.gyp:dbus',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 '<@(nacl_defines)', 101 '<@(nacl_defines)',
101 ], 102 ],
102 'direct_dependent_settings': { 103 'direct_dependent_settings': {
103 'defines': [ 104 'defines': [
104 '<@(nacl_defines)', 105 '<@(nacl_defines)',
105 ], 106 ],
106 }, 107 },
107 'export_dependent_settings': [ 108 'export_dependent_settings': [
108 '../sync/sync.gyp:sync', 109 '../sync/sync.gyp:sync',
109 ], 110 ],
111 'include_dirs': [
112 # breakpad_linux.cc uses generated file_version_info_linux.h.
113 '<(SHARED_INTERMEDIATE_DIR)',
114 '../breakpad/src',
115 ],
110 'sources': [ 116 'sources': [
111 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s 117 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s
112 # and mocks. 118 # and mocks.
113 'browser/chromeos/accessibility/accessibility_manager.cc', 119 'browser/chromeos/accessibility/accessibility_manager.cc',
114 'browser/chromeos/accessibility/accessibility_manager.h', 120 'browser/chromeos/accessibility/accessibility_manager.h',
115 'browser/chromeos/accessibility/accessibility_util.cc', 121 'browser/chromeos/accessibility/accessibility_util.cc',
116 'browser/chromeos/accessibility/accessibility_util.h', 122 'browser/chromeos/accessibility/accessibility_util.h',
117 'browser/chromeos/accessibility/magnification_manager.cc', 123 'browser/chromeos/accessibility/magnification_manager.cc',
118 'browser/chromeos/accessibility/magnification_manager.h', 124 'browser/chromeos/accessibility/magnification_manager.h',
119 'browser/chromeos/app_mode/app_session_lifetime.cc', 125 'browser/chromeos/app_mode/app_session_lifetime.cc',
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 'dependencies': [ 924 'dependencies': [
919 '../ui/aura/aura.gyp:aura', 925 '../ui/aura/aura.gyp:aura',
920 '../ui/compositor/compositor.gyp:compositor', 926 '../ui/compositor/compositor.gyp:compositor',
921 ], 927 ],
922 }], 928 }],
923 ['ui_compositor_image_transport==1', { 929 ['ui_compositor_image_transport==1', {
924 'dependencies': [ 930 'dependencies': [
925 '../ui/gl/gl.gyp:gl', 931 '../ui/gl/gl.gyp:gl',
926 ], 932 ],
927 }], 933 }],
928 ['linux_breakpad==1', {
929 'dependencies': [
930 '../breakpad/breakpad.gyp:breakpad_client',
931 # make sure file_version_info_linux.h is generated first.
932 'common',
933 ],
934 'include_dirs': [
935 # breakpad_linux.cc uses generated file_version_info_linux.h.
936 '<(SHARED_INTERMEDIATE_DIR)',
937 '../breakpad/src',
938 ],
939 }],
940 ['use_aura==1',{ 934 ['use_aura==1',{
941 'dependencies': [ 935 'dependencies': [
942 '../build/linux/system.gyp:dbus', 936 '../build/linux/system.gyp:dbus',
943 '../build/linux/system.gyp:fontconfig', 937 '../build/linux/system.gyp:fontconfig',
944 '../build/linux/system.gyp:x11', 938 '../build/linux/system.gyp:x11',
945 '../ui/views/views.gyp:views', 939 '../ui/views/views.gyp:views',
946 ], 940 ],
947 'include_dirs': [ 941 'include_dirs': [
948 '<(INTERMEDIATE_DIR)', 942 '<(INTERMEDIATE_DIR)',
949 '<(INTERMEDIATE_DIR)/chrome', 943 '<(INTERMEDIATE_DIR)/chrome',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
988 'browser/chromeos/attestation/attestation_key_payload.proto', 982 'browser/chromeos/attestation/attestation_key_payload.proto',
989 ], 983 ],
990 'variables': { 984 'variables': {
991 'proto_in_dir': 'browser/chromeos/attestation', 985 'proto_in_dir': 'browser/chromeos/attestation',
992 'proto_out_dir': 'chrome/browser/chromeos/attestation', 986 'proto_out_dir': 'chrome/browser/chromeos/attestation',
993 }, 987 },
994 'includes': [ '../build/protoc.gypi' ] 988 'includes': [ '../build/protoc.gypi' ]
995 }, 989 },
996 ], 990 ],
997 } 991 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698