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

Side by Side Diff: chrome/browser_tests.isolate

Issue 1318583002: Remove references to an old gyp variable that's no longer supported. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « build/isolate.gypi ('k') | chrome/chrome_dll_bundle.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 'conditions': [ 5 'conditions': [
6 ['use_x11==0', { 6 ['use_x11==0', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/test_env.py', 9 '../testing/test_env.py',
10 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 }, 43 },
44 }], 44 }],
45 ['OS=="linux" and branding=="Chrome" and enable_pepper_cdms==1', { 45 ['OS=="linux" and branding=="Chrome" and enable_pepper_cdms==1', {
46 'variables': { 46 'variables': {
47 'files': [ 47 'files': [
48 '<(PRODUCT_DIR)/libwidevinecdm.so', 48 '<(PRODUCT_DIR)/libwidevinecdm.so',
49 '<(PRODUCT_DIR)/libwidevinecdmadapter.so', 49 '<(PRODUCT_DIR)/libwidevinecdmadapter.so',
50 ], 50 ],
51 }, 51 },
52 }], 52 }],
53 ['OS=="linux" and libpeer_target_type=="loadable_module"', {
54 'variables': {
55 'files': [
56 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
57 ],
58 },
59 }],
60 ['OS=="linux" or OS=="mac" or OS=="win"', { 53 ['OS=="linux" or OS=="mac" or OS=="win"', {
61 'variables': { 54 'variables': {
62 'files': [ 55 'files': [
63 '../content/test/data/', 56 '../content/test/data/',
64 '../google_apis/test/', 57 '../google_apis/test/',
65 '../media/test/data/', 58 '../media/test/data/',
66 '../media/test/data/', 59 '../media/test/data/',
67 '../net/data/', 60 '../net/data/',
68 '../net/tools/testserver/', 61 '../net/tools/testserver/',
69 '../ppapi/tests/test_case.html', 62 '../ppapi/tests/test_case.html',
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 'browser/chromeos/login/test/https_forwarder.py', 254 'browser/chromeos/login/test/https_forwarder.py',
262 ], 255 ],
263 }, 256 },
264 }], 257 }],
265 ], 258 ],
266 'includes': [ 259 'includes': [
267 '../base/base.isolate', 260 '../base/base.isolate',
268 'chrome.isolate', 261 'chrome.isolate',
269 ], 262 ],
270 } 263 }
OLDNEW
« no previous file with comments | « build/isolate.gypi ('k') | chrome/chrome_dll_bundle.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698