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

Side by Side Diff: chrome/sync_integration_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
« no previous file with comments | « chrome/plugin/chrome_content_plugin_client.cc ('k') | chrome/test/base/chrome_test_suite.cc » ('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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', 9 '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
10 '--test-launcher-bot-mode', 10 '--test-launcher-bot-mode',
(...skipping 11 matching lines...) Expand all
22 'files': [ 22 'files': [
23 '../testing/test_env.py', 23 '../testing/test_env.py',
24 '../testing/xvfb.py', 24 '../testing/xvfb.py',
25 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 25 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
26 ], 26 ],
27 }, 27 },
28 }], 28 }],
29 ['OS=="linux"', { 29 ['OS=="linux"', {
30 'variables': { 30 'variables': {
31 'files': [ 31 'files': [
32 '<(PRODUCT_DIR)/libffmpegsumo.so',
32 '<(PRODUCT_DIR)/libosmesa.so', 33 '<(PRODUCT_DIR)/libosmesa.so',
33 ], 34 ],
34 }, 35 },
35 }], 36 }],
36 ['OS=="linux" or OS=="win"', { 37 ['OS=="linux" or OS=="win"', {
37 'variables': { 38 'variables': {
38 'files': [ 39 'files': [
39 '<(PRODUCT_DIR)/chrome_100_percent.pak', 40 '<(PRODUCT_DIR)/chrome_100_percent.pak',
40 '<(PRODUCT_DIR)/locales/en-US.pak', 41 '<(PRODUCT_DIR)/locales/en-US.pak',
41 ], 42 ],
(...skipping 12 matching lines...) Expand all
54 '<(PRODUCT_DIR)/resources.pak', 55 '<(PRODUCT_DIR)/resources.pak',
55 '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', 56 '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
56 ], 57 ],
57 }, 58 },
58 }], 59 }],
59 ['OS=="mac"', { 60 ['OS=="mac"', {
60 'variables': { 61 'variables': {
61 'files': [ 62 'files': [
62 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 63 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
63 '<(PRODUCT_DIR)/<(mac_product_name).app/', 64 '<(PRODUCT_DIR)/<(mac_product_name).app/',
65 '<(PRODUCT_DIR)/ffmpegsumo.so',
64 ], 66 ],
65 }, 67 },
66 }], 68 }],
67 ['OS=="mac" and asan==1 and fastbuild==0', { 69 ['OS=="mac" and asan==1 and fastbuild==0', {
68 'variables': { 70 'variables': {
69 'files': [ 71 'files': [
70 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/', 72 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/',
71 '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/', 73 '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/',
74 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
72 ], 75 ],
73 }, 76 },
74 }], 77 }],
75 ['OS=="win"', { 78 ['OS=="win"', {
76 'variables': { 79 'variables': {
77 'files': [ 80 'files': [
78 '<(PRODUCT_DIR)/chrome_elf.dll', 81 '<(PRODUCT_DIR)/chrome_elf.dll',
82 '<(PRODUCT_DIR)/ffmpegsumo.dll',
79 ], 83 ],
80 }, 84 },
81 }], 85 }],
82 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 86 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
83 'variables': { 87 'variables': {
84 'files': [ 88 'files': [
85 '<(PRODUCT_DIR)/sync_integration_tests.exe.pdb', 89 '<(PRODUCT_DIR)/sync_integration_tests.exe.pdb',
86 ], 90 ],
87 }, 91 },
88 }], 92 }],
(...skipping 18 matching lines...) Expand all
107 ], 111 ],
108 }, 112 },
109 }], 113 }],
110 ], 114 ],
111 'includes': [ 115 'includes': [
112 '../base/base.isolate', 116 '../base/base.isolate',
113 '../gin/v8.isolate', 117 '../gin/v8.isolate',
114 '../third_party/angle/angle.isolate', 118 '../third_party/angle/angle.isolate',
115 ], 119 ],
116 } 120 }
OLDNEW
« no previous file with comments | « chrome/plugin/chrome_content_plugin_client.cc ('k') | chrome/test/base/chrome_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698