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

Side by Side Diff: chrome/interactive_ui_tests.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
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',
39 '<(PRODUCT_DIR)/libosmesa.so', 38 '<(PRODUCT_DIR)/libosmesa.so',
40 '<(PRODUCT_DIR)/libppapi_tests.so', 39 '<(PRODUCT_DIR)/libppapi_tests.so',
41 '<(PRODUCT_DIR)/pyproto/google/', 40 '<(PRODUCT_DIR)/pyproto/google/',
42 ], 41 ],
43 }, 42 },
44 }], 43 }],
45 ['OS=="linux" or OS=="mac" or OS=="win"', { 44 ['OS=="linux" or OS=="mac" or OS=="win"', {
46 'variables': { 45 'variables': {
47 'files': [ 46 'files': [
48 '../net/data/ssl/certificates/', 47 '../net/data/ssl/certificates/',
(...skipping 21 matching lines...) Expand all
70 '<(PRODUCT_DIR)/locales/en-US.pak', 69 '<(PRODUCT_DIR)/locales/en-US.pak',
71 '<(PRODUCT_DIR)/locales/fr.pak', 70 '<(PRODUCT_DIR)/locales/fr.pak',
72 ], 71 ],
73 }, 72 },
74 }], 73 }],
75 ['OS=="mac"', { 74 ['OS=="mac"', {
76 'variables': { 75 'variables': {
77 'files': [ 76 'files': [
78 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 77 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
79 '<(PRODUCT_DIR)/<(mac_product_name).app/', 78 '<(PRODUCT_DIR)/<(mac_product_name).app/',
80 '<(PRODUCT_DIR)/ffmpegsumo.so',
81 '<(PRODUCT_DIR)/osmesa.so', 79 '<(PRODUCT_DIR)/osmesa.so',
82 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', 80 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
83 ], 81 ],
84 }, 82 },
85 }], 83 }],
86 ['OS=="mac" and asan==1 and fastbuild==0', { 84 ['OS=="mac" and asan==1 and fastbuild==0', {
87 'variables': { 85 'variables': {
88 'files': [ 86 'files': [
89 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 87 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
90 '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/', 88 '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/',
91 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
92 '<(PRODUCT_DIR)/interactive_ui_tests.dSYM/', 89 '<(PRODUCT_DIR)/interactive_ui_tests.dSYM/',
93 '<(PRODUCT_DIR)/osmesa.so.dSYM/', 90 '<(PRODUCT_DIR)/osmesa.so.dSYM/',
94 '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/', 91 '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/',
95 ], 92 ],
96 }, 93 },
97 }], 94 }],
98 ['OS=="win"', { 95 ['OS=="win"', {
99 'variables': { 96 'variables': {
100 'files': [ 97 'files': [
101 '<(PRODUCT_DIR)/chrome_elf.dll', 98 '<(PRODUCT_DIR)/chrome_elf.dll',
102 '<(PRODUCT_DIR)/d3dcompiler_47.dll', 99 '<(PRODUCT_DIR)/d3dcompiler_47.dll',
103 '<(PRODUCT_DIR)/ffmpegsumo.dll',
104 '<(PRODUCT_DIR)/libEGL.dll', 100 '<(PRODUCT_DIR)/libEGL.dll',
105 '<(PRODUCT_DIR)/libGLESv2.dll', 101 '<(PRODUCT_DIR)/libGLESv2.dll',
106 '<(PRODUCT_DIR)/osmesa.dll', 102 '<(PRODUCT_DIR)/osmesa.dll',
107 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', 103 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
108 '<(PRODUCT_DIR)/ppapi_tests.dll', 104 '<(PRODUCT_DIR)/ppapi_tests.dll',
109 ], 105 ],
110 }, 106 },
111 }], 107 }],
112 ['OS=="win" and target_arch=="ia32"', { 108 ['OS=="win" and target_arch=="ia32"', {
113 'variables': { 109 'variables': {
(...skipping 28 matching lines...) Expand all
142 'browser/chromeos/login/test/https_forwarder.py', 138 'browser/chromeos/login/test/https_forwarder.py',
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 ], 146 ],
151 } 147 }
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