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

Side by Side Diff: trunk/src/content/content_browsertests.isolate

Issue 200033005: Revert 258062 "Turns on use_mojo=1 for linux." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/chrome/unit_tests.isolate ('k') | trunk/src/content/content_unittests.isolate » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 ['OS=="android"', { 6 ['OS=="android"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_tracked': [ 8 'isolate_dependency_tracked': [
9 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', 9 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
10 ], 10 ],
(...skipping 15 matching lines...) Expand all
26 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 26 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
27 '--test-launcher-bot-mode', 27 '--test-launcher-bot-mode',
28 ], 28 ],
29 'isolate_dependency_tracked': [ 29 'isolate_dependency_tracked': [
30 '../testing/xvfb.py', 30 '../testing/xvfb.py',
31 '<(PRODUCT_DIR)/content_shell.pak', 31 '<(PRODUCT_DIR)/content_shell.pak',
32 '<(PRODUCT_DIR)/fonts.conf', 32 '<(PRODUCT_DIR)/fonts.conf',
33 '<(PRODUCT_DIR)/libclearkeycdm.so', 33 '<(PRODUCT_DIR)/libclearkeycdm.so',
34 '<(PRODUCT_DIR)/libclearkeycdmadapter.so', 34 '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
35 '<(PRODUCT_DIR)/libffmpegsumo.so', 35 '<(PRODUCT_DIR)/libffmpegsumo.so',
36 '<(PRODUCT_DIR)/lib/libmojo_system.so',
37 '<(PRODUCT_DIR)/plugins/libtest_netscape_plugin.so', 36 '<(PRODUCT_DIR)/plugins/libtest_netscape_plugin.so',
38 '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so', 37 '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so',
39 ], 38 ],
40 }, 39 },
41 }], 40 }],
42 ['OS=="linux" or OS=="mac" or OS=="win"', { 41 ['OS=="linux" or OS=="mac" or OS=="win"', {
43 'variables': { 42 'variables': {
44 'isolate_dependency_tracked': [ 43 'isolate_dependency_tracked': [
45 '../testing/test_env.py', 44 '../testing/test_env.py',
46 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 45 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 '<(PRODUCT_DIR)/clearkeycdm.dll', 86 '<(PRODUCT_DIR)/clearkeycdm.dll',
88 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', 87 '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
89 '<(PRODUCT_DIR)/content_shell.pak', 88 '<(PRODUCT_DIR)/content_shell.pak',
90 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll', 89 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',
91 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', 90 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
92 ], 91 ],
93 }, 92 },
94 }], 93 }],
95 ], 94 ],
96 } 95 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/unit_tests.isolate ('k') | trunk/src/content/content_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698