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

Side by Side Diff: chrome/interactive_ui_tests.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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
(...skipping 17 matching lines...) Expand all
28 ], 28 ],
29 'files': [ 29 'files': [
30 '../testing/xvfb.py', 30 '../testing/xvfb.py',
31 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 31 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
32 ], 32 ],
33 }, 33 },
34 }], 34 }],
35 ['OS=="linux"', { 35 ['OS=="linux"', {
36 'variables': { 36 'variables': {
37 'files': [ 37 'files': [
38 '<(PRODUCT_DIR)/libffmpegsumo.so',
38 '<(PRODUCT_DIR)/libosmesa.so', 39 '<(PRODUCT_DIR)/libosmesa.so',
39 '<(PRODUCT_DIR)/libppapi_tests.so', 40 '<(PRODUCT_DIR)/libppapi_tests.so',
40 '<(PRODUCT_DIR)/pyproto/google/', 41 '<(PRODUCT_DIR)/pyproto/google/',
41 ], 42 ],
42 }, 43 },
43 }], 44 }],
44 ['OS=="linux" or OS=="mac" or OS=="win"', { 45 ['OS=="linux" or OS=="mac" or OS=="win"', {
45 'variables': { 46 'variables': {
46 'files': [ 47 'files': [
47 '../net/data/ssl/certificates/', 48 '../net/data/ssl/certificates/',
(...skipping 21 matching lines...) Expand all
69 '<(PRODUCT_DIR)/locales/en-US.pak', 70 '<(PRODUCT_DIR)/locales/en-US.pak',
70 '<(PRODUCT_DIR)/locales/fr.pak', 71 '<(PRODUCT_DIR)/locales/fr.pak',
71 ], 72 ],
72 }, 73 },
73 }], 74 }],
74 ['OS=="mac"', { 75 ['OS=="mac"', {
75 'variables': { 76 'variables': {
76 'files': [ 77 'files': [
77 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 78 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
78 '<(PRODUCT_DIR)/<(mac_product_name).app/', 79 '<(PRODUCT_DIR)/<(mac_product_name).app/',
80 '<(PRODUCT_DIR)/ffmpegsumo.so',
79 '<(PRODUCT_DIR)/osmesa.so', 81 '<(PRODUCT_DIR)/osmesa.so',
80 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', 82 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
81 ], 83 ],
82 }, 84 },
83 }], 85 }],
84 ['OS=="mac" and asan==1 and fastbuild==0', { 86 ['OS=="mac" and asan==1 and fastbuild==0', {
85 'variables': { 87 'variables': {
86 'files': [ 88 'files': [
87 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 89 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
88 '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/', 90 '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/',
91 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
89 '<(PRODUCT_DIR)/interactive_ui_tests.dSYM/', 92 '<(PRODUCT_DIR)/interactive_ui_tests.dSYM/',
90 '<(PRODUCT_DIR)/osmesa.so.dSYM/', 93 '<(PRODUCT_DIR)/osmesa.so.dSYM/',
91 '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/', 94 '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/',
92 ], 95 ],
93 }, 96 },
94 }], 97 }],
95 ['OS=="win"', { 98 ['OS=="win"', {
96 'variables': { 99 'variables': {
97 'files': [ 100 'files': [
98 '<(PRODUCT_DIR)/chrome_elf.dll', 101 '<(PRODUCT_DIR)/chrome_elf.dll',
99 '<(PRODUCT_DIR)/d3dcompiler_47.dll', 102 '<(PRODUCT_DIR)/d3dcompiler_47.dll',
103 '<(PRODUCT_DIR)/ffmpegsumo.dll',
100 '<(PRODUCT_DIR)/libEGL.dll', 104 '<(PRODUCT_DIR)/libEGL.dll',
101 '<(PRODUCT_DIR)/libGLESv2.dll', 105 '<(PRODUCT_DIR)/libGLESv2.dll',
102 '<(PRODUCT_DIR)/osmesa.dll', 106 '<(PRODUCT_DIR)/osmesa.dll',
103 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', 107 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
104 '<(PRODUCT_DIR)/ppapi_tests.dll', 108 '<(PRODUCT_DIR)/ppapi_tests.dll',
105 ], 109 ],
106 }, 110 },
107 }], 111 }],
108 ['OS=="win" and target_arch=="ia32"', { 112 ['OS=="win" and target_arch=="ia32"', {
109 'variables': { 113 'variables': {
(...skipping 28 matching lines...) Expand all
138 'browser/chromeos/login/test/https_forwarder.py', 142 'browser/chromeos/login/test/https_forwarder.py',
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 ], 150 ],
147 } 151 }
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer/chrome.release ('k') | chrome/plugin/chrome_content_plugin_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698