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

Side by Side Diff: content/content_browsertests.isolate

Issue 203963003: Turns on use_mojo=1 for linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos==0 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
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 20 matching lines...) Expand all
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)/plugins/libtest_netscape_plugin.so', 36 '<(PRODUCT_DIR)/plugins/libtest_netscape_plugin.so',
37 '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so', 37 '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so',
38 ], 38 ],
39 }, 39 },
40 }], 40 }],
41 ['OS=="linux" and use_mojo==1', {
42 'variables': {
43 'isolate_dependency_tracked': [
44 '<(PRODUCT_DIR)/lib/libmojo_system.so',
45 ],
46 },
47 }],
41 ['OS=="linux" or OS=="mac" or OS=="win"', { 48 ['OS=="linux" or OS=="mac" or OS=="win"', {
42 'variables': { 49 'variables': {
43 'isolate_dependency_tracked': [ 50 'isolate_dependency_tracked': [
44 '../testing/test_env.py', 51 '../testing/test_env.py',
45 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 52 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
46 ], 53 ],
47 'isolate_dependency_untracked': [ 54 'isolate_dependency_untracked': [
48 '../net/tools/testserver/', 55 '../net/tools/testserver/',
49 '../third_party/WebKit/Tools/Scripts/', 56 '../third_party/WebKit/Tools/Scripts/',
50 '../third_party/lighttpd/', 57 '../third_party/lighttpd/',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 '<(PRODUCT_DIR)/clearkeycdm.dll', 93 '<(PRODUCT_DIR)/clearkeycdm.dll',
87 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', 94 '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
88 '<(PRODUCT_DIR)/content_shell.pak', 95 '<(PRODUCT_DIR)/content_shell.pak',
89 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll', 96 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',
90 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', 97 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
91 ], 98 ],
92 }, 99 },
93 }], 100 }],
94 ], 101 ],
95 } 102 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698