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

Side by Side Diff: build/all.gyp

Issue 1023783005: Merge Crashpad to the 42.0.2311 branch (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2311
Patch Set: Created 5 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
« no previous file with comments | « base/scoped_generic_unittest.cc ('k') | chrome/app/chrome_crash_reporter_client.h » ('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 'variables': { 6 'variables': {
7 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. 8 # compilation targets to 'All'.
9 'app_targets%': [], 9 'app_targets%': [],
10 # For Android-specific targets. 10 # For Android-specific targets.
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 ], 157 ],
158 }], 158 }],
159 ['OS=="win" or OS=="ios" or OS=="linux"', { 159 ['OS=="win" or OS=="ios" or OS=="linux"', {
160 'dependencies': [ 160 'dependencies': [
161 '../breakpad/breakpad.gyp:*', 161 '../breakpad/breakpad.gyp:*',
162 ], 162 ],
163 }], 163 }],
164 ['OS=="mac"', { 164 ['OS=="mac"', {
165 'dependencies': [ 165 'dependencies': [
166 '../sandbox/sandbox.gyp:*', 166 '../sandbox/sandbox.gyp:*',
167 '../third_party/crashpad/crashpad/crashpad.gyp:*',
167 '../third_party/ocmock/ocmock.gyp:*', 168 '../third_party/ocmock/ocmock.gyp:*',
168 ], 169 ],
169 }], 170 }],
170 ['OS=="linux"', { 171 ['OS=="linux"', {
171 'dependencies': [ 172 'dependencies': [
172 '../courgette/courgette.gyp:*', 173 '../courgette/courgette.gyp:*',
173 '../dbus/dbus.gyp:*', 174 '../dbus/dbus.gyp:*',
174 '../sandbox/sandbox.gyp:*', 175 '../sandbox/sandbox.gyp:*',
175 ], 176 ],
176 'conditions': [ 177 'conditions': [
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 'dependencies': [ 1324 'dependencies': [
1324 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1325 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1325 '../ui/views/views.gyp:views', 1326 '../ui/views/views.gyp:views',
1326 '../ui/views/views.gyp:views_unittests', 1327 '../ui/views/views.gyp:views_unittests',
1327 ], 1328 ],
1328 }, # target_name: macviews_builder 1329 }, # target_name: macviews_builder
1329 ], # targets 1330 ], # targets
1330 }], # os=='mac' and toolkit_views==1 1331 }], # os=='mac' and toolkit_views==1
1331 ], # conditions 1332 ], # conditions
1332 } 1333 }
OLDNEW
« no previous file with comments | « base/scoped_generic_unittest.cc ('k') | chrome/app/chrome_crash_reporter_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698