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

Unified Diff: content/content_browsertests.isolate

Issue 614923005: Rename all isolate_dependency_* to files. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: . Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/nacl_loader_unittests.isolate ('k') | content/content_gl_tests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browsertests.isolate
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index e794b2f47ca2723527fced1cfcb2ce4d62e79e43..1c45e865a99d3c33b226baf740fb3e3ee9aa47a6 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -5,28 +5,28 @@
'conditions': [
['OS=="android"', {
'variables': {
- 'isolate_dependency_tracked': [
+ 'files': [
'<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
],
},
}],
['chromeos==1', {
'variables': {
- 'isolate_dependency_tracked': [
+ 'files': [
'<(PRODUCT_DIR)/content_shell.pak',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
- 'isolate_dependency_tracked': [
+ 'files': [
'<(PRODUCT_DIR)/content_shell.pak',
],
},
}],
['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
- 'isolate_dependency_untracked': [
+ 'files': [
'../media/test/data/',
'../net/data/',
'test/data/',
@@ -42,7 +42,7 @@
'--test-launcher-bot-mode',
'--lsan=<(lsan)',
],
- 'isolate_dependency_tracked': [
+ 'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/content_shell.pak',
'<(PRODUCT_DIR)/libffmpegsumo.so',
@@ -53,37 +53,33 @@
}],
['OS=="linux" and use_ozone==0', {
'variables': {
- 'isolate_dependency_tracked': [
+ 'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
- 'isolate_dependency_tracked': [
+ 'files': [
+ '../net/tools/testserver/',
'../ppapi/tests/test_case.html',
'../ppapi/tests/test_page.css',
'../testing/test_env.py',
- '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
- ],
- 'isolate_dependency_untracked': [
- '../net/tools/testserver/',
'../third_party/pyftpdlib/',
'../third_party/pywebsocket/',
'../third_party/tlslite/',
+ '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="mac"', {
'variables': {
- 'isolate_dependency_tracked': [
- '<(PRODUCT_DIR)/ffmpegsumo.so',
- '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
- ],
- 'isolate_dependency_untracked': [
+ 'files': [
'<(PRODUCT_DIR)/Content Shell.app/',
+ '<(PRODUCT_DIR)/ffmpegsumo.so',
'<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',
'<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/',
+ '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
],
},
}],
@@ -98,7 +94,7 @@
}],
['OS=="win"', {
'variables': {
- 'isolate_dependency_tracked': [
+ 'files': [
'<(PRODUCT_DIR)/content_shell.pak',
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/osmesa.dll',
@@ -110,7 +106,7 @@
}],
['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': {
- 'isolate_dependency_untracked': [
+ 'files': [
'<(PRODUCT_DIR)/content_browsertests.exe.pdb',
],
},
« no previous file with comments | « components/nacl_loader_unittests.isolate ('k') | content/content_gl_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698