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

Side by Side Diff: content/content_browsertests.isolate

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll DEPS to fix cros, rebase. Created 5 years, 6 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 | « content/browser/browser_main_loop.cc ('k') | content/content_gl_tests.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 ['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)/content_browsertests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 '../media/test/data/', 59 '../media/test/data/',
60 '../net/data/', 60 '../net/data/',
61 'test/data/', 61 'test/data/',
62 ], 62 ],
63 }, 63 },
64 }], 64 }],
65 ['OS=="linux"', { 65 ['OS=="linux"', {
66 'variables': { 66 'variables': {
67 'files': [ 67 'files': [
68 '<(PRODUCT_DIR)/content_shell.pak', 68 '<(PRODUCT_DIR)/content_shell.pak',
69 '<(PRODUCT_DIR)/libffmpegsumo.so',
70 '<(PRODUCT_DIR)/libosmesa.so', 69 '<(PRODUCT_DIR)/libosmesa.so',
71 ], 70 ],
72 }, 71 },
73 }], 72 }],
74 ['OS=="linux" and enable_plugins==1', { 73 ['OS=="linux" and enable_plugins==1', {
75 'variables': { 74 'variables': {
76 'files': [ 75 'files': [
77 '<(PRODUCT_DIR)/libppapi_tests.so', 76 '<(PRODUCT_DIR)/libppapi_tests.so',
78 ], 77 ],
79 }, 78 },
80 }], 79 }],
81 ['OS=="linux" or OS=="mac" or OS=="win"', { 80 ['OS=="linux" or OS=="mac" or OS=="win"', {
82 'variables': { 81 'variables': {
83 'files': [ 82 'files': [
84 '../net/tools/testserver/', 83 '../net/tools/testserver/',
85 '../ppapi/tests/test_case.html', 84 '../ppapi/tests/test_case.html',
86 '../ppapi/tests/test_page.css', 85 '../ppapi/tests/test_page.css',
87 '../testing/test_env.py', 86 '../testing/test_env.py',
88 '../third_party/pyftpdlib/', 87 '../third_party/pyftpdlib/',
89 '../third_party/pywebsocket/', 88 '../third_party/pywebsocket/',
90 '../third_party/tlslite/', 89 '../third_party/tlslite/',
91 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 90 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
92 ], 91 ],
93 }, 92 },
94 }], 93 }],
95 ['OS=="mac"', { 94 ['OS=="mac"', {
96 'variables': { 95 'variables': {
97 'files': [ 96 'files': [
98 '<(PRODUCT_DIR)/Content Shell.app/', 97 '<(PRODUCT_DIR)/Content Shell.app/',
99 '<(PRODUCT_DIR)/ffmpegsumo.so',
100 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/', 98 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',
101 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/', 99 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/',
102 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', 100 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
103 ], 101 ],
104 }, 102 },
105 }], 103 }],
106 ['OS=="mac" and asan==1 and fastbuild==0', { 104 ['OS=="mac" and asan==1 and fastbuild==0', {
107 'variables': { 105 'variables': {
108 'files': [ 106 'files': [
109 '<(PRODUCT_DIR)/Content Shell Framework.framework.dSYM/', 107 '<(PRODUCT_DIR)/Content Shell Framework.framework.dSYM/',
110 '<(PRODUCT_DIR)/Content Shell Helper.app.dSYM/', 108 '<(PRODUCT_DIR)/Content Shell Helper.app.dSYM/',
111 '<(PRODUCT_DIR)/Content Shell.app.dSYM/', 109 '<(PRODUCT_DIR)/Content Shell.app.dSYM/',
112 '<(PRODUCT_DIR)/content_browsertests.dSYM/', 110 '<(PRODUCT_DIR)/content_browsertests.dSYM/',
113 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
114 '<(PRODUCT_DIR)/npapi_test_plugin.plugin.dSYM/', 111 '<(PRODUCT_DIR)/npapi_test_plugin.plugin.dSYM/',
115 '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/', 112 '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/',
116 '<(PRODUCT_DIR)/test_netscape_plugin.plugin.dSYM/', 113 '<(PRODUCT_DIR)/test_netscape_plugin.plugin.dSYM/',
117 ], 114 ],
118 }, 115 },
119 }], 116 }],
120 ['OS=="win"', { 117 ['OS=="win"', {
121 'variables': { 118 'variables': {
122 'files': [ 119 'files': [
123 '<(PRODUCT_DIR)/content_shell.pak', 120 '<(PRODUCT_DIR)/content_shell.pak',
124 '<(PRODUCT_DIR)/ffmpegsumo.dll',
125 '<(PRODUCT_DIR)/osmesa.dll', 121 '<(PRODUCT_DIR)/osmesa.dll',
126 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll', 122 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',
127 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', 123 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
128 '<(PRODUCT_DIR)/ppapi_tests.dll', 124 '<(PRODUCT_DIR)/ppapi_tests.dll',
129 ], 125 ],
130 }, 126 },
131 }], 127 }],
132 ['OS=="win" and target_arch=="ia32"', { 128 ['OS=="win" and target_arch=="ia32"', {
133 'variables': { 129 'variables': {
134 'files': [ 130 'files': [
135 '<(PRODUCT_DIR)/wow_helper.exe', 131 '<(PRODUCT_DIR)/wow_helper.exe',
136 ], 132 ],
137 }, 133 },
138 }], 134 }],
139 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 135 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
140 'variables': { 136 'variables': {
141 'files': [ 137 'files': [
142 '<(PRODUCT_DIR)/content_browsertests.exe.pdb', 138 '<(PRODUCT_DIR)/content_browsertests.exe.pdb',
143 ], 139 ],
144 }, 140 },
145 }], 141 }],
146 ], 142 ],
147 'includes': [ 143 'includes': [
148 '../base/base.isolate', 144 '../base/base.isolate',
149 '../gin/v8.isolate', 145 '../gin/v8.isolate',
150 '../third_party/angle/angle.isolate', 146 '../third_party/angle/angle.isolate',
151 ], 147 ],
152 } 148 }
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/content_gl_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698