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

Side by Side Diff: content/browser/gpu/test_support_gpu.gypi

Issue 1918303002: Renaming system.gyp:ssl to system.gyp:nss and removing unused BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 7 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 | « components/ownership.gypi ('k') | crypto/crypto.gyp » ('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 # This file is meant to be included into targets which run gpu tests. 5 # This file is meant to be included into targets which run gpu tests.
6 { 6 {
7 'variables': { 7 'variables': {
8 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/test/gpu', 8 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/test/gpu',
9 'src_dir': '../../..', 9 'src_dir': '../../..',
10 }, 10 },
(...skipping 23 matching lines...) Expand all
34 }, 34 },
35 }, 35 },
36 }, 36 },
37 }], 37 }],
38 ['OS=="mac"', { 38 ['OS=="mac"', {
39 # See comments about "xcode_settings" elsewhere in this file. 39 # See comments about "xcode_settings" elsewhere in this file.
40 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 40 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
41 }], 41 }],
42 ['chromeos==1 or (OS=="linux" and use_aura==1)', { 42 ['chromeos==1 or (OS=="linux" and use_aura==1)', {
43 'dependencies': [ 43 'dependencies': [
44 '<(src_dir)/build/linux/system.gyp:ssl', 44 '<(src_dir)/build/linux/system.gyp:nss',
45 ], 45 ],
46 }], 46 }],
47 ['toolkit_views==1', { 47 ['toolkit_views==1', {
48 'dependencies': [ 48 'dependencies': [
49 '<(src_dir)/ui/views/views.gyp:views', 49 '<(src_dir)/ui/views/views.gyp:views',
50 ], 50 ],
51 }], 51 }],
52 ], 52 ],
53 } 53 }
OLDNEW
« no previous file with comments | « components/ownership.gypi ('k') | crypto/crypto.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698