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

Side by Side Diff: content/content_browsertests.isolate

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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',
69 '<(PRODUCT_DIR)/libosmesa.so', 70 '<(PRODUCT_DIR)/libosmesa.so',
70 ], 71 ],
71 }, 72 },
72 }], 73 }],
73 ['OS=="linux" and enable_plugins==1', { 74 ['OS=="linux" and enable_plugins==1', {
74 'variables': { 75 'variables': {
75 'files': [ 76 'files': [
76 '<(PRODUCT_DIR)/libppapi_tests.so', 77 '<(PRODUCT_DIR)/libppapi_tests.so',
77 ], 78 ],
78 }, 79 },
79 }], 80 }],
80 ['OS=="linux" or OS=="mac" or OS=="win"', { 81 ['OS=="linux" or OS=="mac" or OS=="win"', {
81 'variables': { 82 'variables': {
82 'files': [ 83 'files': [
83 '../net/tools/testserver/', 84 '../net/tools/testserver/',
84 '../ppapi/tests/test_case.html', 85 '../ppapi/tests/test_case.html',
85 '../ppapi/tests/test_page.css', 86 '../ppapi/tests/test_page.css',
86 '../testing/test_env.py', 87 '../testing/test_env.py',
87 '../third_party/pyftpdlib/', 88 '../third_party/pyftpdlib/',
88 '../third_party/pywebsocket/', 89 '../third_party/pywebsocket/',
89 '../third_party/tlslite/', 90 '../third_party/tlslite/',
90 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', 91 '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
91 ], 92 ],
92 }, 93 },
93 }], 94 }],
94 ['OS=="mac"', { 95 ['OS=="mac"', {
95 'variables': { 96 'variables': {
96 'files': [ 97 'files': [
97 '<(PRODUCT_DIR)/Content Shell.app/', 98 '<(PRODUCT_DIR)/Content Shell.app/',
99 '<(PRODUCT_DIR)/ffmpegsumo.so',
98 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/', 100 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',
99 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/', 101 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/',
100 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', 102 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
101 ], 103 ],
102 }, 104 },
103 }], 105 }],
104 ['OS=="mac" and asan==1 and fastbuild==0', { 106 ['OS=="mac" and asan==1 and fastbuild==0', {
105 'variables': { 107 'variables': {
106 'files': [ 108 'files': [
107 '<(PRODUCT_DIR)/Content Shell Framework.framework.dSYM/', 109 '<(PRODUCT_DIR)/Content Shell Framework.framework.dSYM/',
108 '<(PRODUCT_DIR)/Content Shell Helper.app.dSYM/', 110 '<(PRODUCT_DIR)/Content Shell Helper.app.dSYM/',
109 '<(PRODUCT_DIR)/Content Shell.app.dSYM/', 111 '<(PRODUCT_DIR)/Content Shell.app.dSYM/',
110 '<(PRODUCT_DIR)/content_browsertests.dSYM/', 112 '<(PRODUCT_DIR)/content_browsertests.dSYM/',
113 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
111 '<(PRODUCT_DIR)/npapi_test_plugin.plugin.dSYM/', 114 '<(PRODUCT_DIR)/npapi_test_plugin.plugin.dSYM/',
112 '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/', 115 '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/',
113 '<(PRODUCT_DIR)/test_netscape_plugin.plugin.dSYM/', 116 '<(PRODUCT_DIR)/test_netscape_plugin.plugin.dSYM/',
114 ], 117 ],
115 }, 118 },
116 }], 119 }],
117 ['OS=="win"', { 120 ['OS=="win"', {
118 'variables': { 121 'variables': {
119 'files': [ 122 'files': [
120 '<(PRODUCT_DIR)/content_shell.pak', 123 '<(PRODUCT_DIR)/content_shell.pak',
124 '<(PRODUCT_DIR)/ffmpegsumo.dll',
121 '<(PRODUCT_DIR)/osmesa.dll', 125 '<(PRODUCT_DIR)/osmesa.dll',
122 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll', 126 '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',
123 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', 127 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
124 '<(PRODUCT_DIR)/ppapi_tests.dll', 128 '<(PRODUCT_DIR)/ppapi_tests.dll',
125 ], 129 ],
126 }, 130 },
127 }], 131 }],
128 ['OS=="win" and target_arch=="ia32"', { 132 ['OS=="win" and target_arch=="ia32"', {
129 'variables': { 133 'variables': {
130 'files': [ 134 'files': [
131 '<(PRODUCT_DIR)/wow_helper.exe', 135 '<(PRODUCT_DIR)/wow_helper.exe',
132 ], 136 ],
133 }, 137 },
134 }], 138 }],
135 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 139 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
136 'variables': { 140 'variables': {
137 'files': [ 141 'files': [
138 '<(PRODUCT_DIR)/content_browsertests.exe.pdb', 142 '<(PRODUCT_DIR)/content_browsertests.exe.pdb',
139 ], 143 ],
140 }, 144 },
141 }], 145 }],
142 ], 146 ],
143 'includes': [ 147 'includes': [
144 '../base/base.isolate', 148 '../base/base.isolate',
145 '../gin/v8.isolate', 149 '../gin/v8.isolate',
146 '../third_party/angle/angle.isolate', 150 '../third_party/angle/angle.isolate',
147 ], 151 ],
148 } 152 }
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