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

Side by Side Diff: chrome/sync_integration_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
« 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',
33 '<(PRODUCT_DIR)/libosmesa.so', 32 '<(PRODUCT_DIR)/libosmesa.so',
34 ], 33 ],
35 }, 34 },
36 }], 35 }],
37 ['OS=="linux" or OS=="win"', { 36 ['OS=="linux" or OS=="win"', {
38 'variables': { 37 'variables': {
39 'files': [ 38 'files': [
40 '<(PRODUCT_DIR)/chrome_100_percent.pak', 39 '<(PRODUCT_DIR)/chrome_100_percent.pak',
41 '<(PRODUCT_DIR)/locales/en-US.pak', 40 '<(PRODUCT_DIR)/locales/en-US.pak',
42 ], 41 ],
(...skipping 12 matching lines...) Expand all
55 '<(PRODUCT_DIR)/resources.pak', 54 '<(PRODUCT_DIR)/resources.pak',
56 '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', 55 '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
57 ], 56 ],
58 }, 57 },
59 }], 58 }],
60 ['OS=="mac"', { 59 ['OS=="mac"', {
61 'variables': { 60 'variables': {
62 'files': [ 61 'files': [
63 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 62 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
64 '<(PRODUCT_DIR)/<(mac_product_name).app/', 63 '<(PRODUCT_DIR)/<(mac_product_name).app/',
65 '<(PRODUCT_DIR)/ffmpegsumo.so',
66 ], 64 ],
67 }, 65 },
68 }], 66 }],
69 ['OS=="mac" and asan==1 and fastbuild==0', { 67 ['OS=="mac" and asan==1 and fastbuild==0', {
70 'variables': { 68 'variables': {
71 'files': [ 69 'files': [
72 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/', 70 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/',
73 '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/', 71 '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/',
74 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
75 ], 72 ],
76 }, 73 },
77 }], 74 }],
78 ['OS=="win"', { 75 ['OS=="win"', {
79 'variables': { 76 'variables': {
80 'files': [ 77 'files': [
81 '<(PRODUCT_DIR)/chrome_elf.dll', 78 '<(PRODUCT_DIR)/chrome_elf.dll',
82 '<(PRODUCT_DIR)/ffmpegsumo.dll',
83 ], 79 ],
84 }, 80 },
85 }], 81 }],
86 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 82 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
87 'variables': { 83 'variables': {
88 'files': [ 84 'files': [
89 '<(PRODUCT_DIR)/sync_integration_tests.exe.pdb', 85 '<(PRODUCT_DIR)/sync_integration_tests.exe.pdb',
90 ], 86 ],
91 }, 87 },
92 }], 88 }],
(...skipping 18 matching lines...) Expand all
111 ], 107 ],
112 }, 108 },
113 }], 109 }],
114 ], 110 ],
115 'includes': [ 111 'includes': [
116 '../base/base.isolate', 112 '../base/base.isolate',
117 '../gin/v8.isolate', 113 '../gin/v8.isolate',
118 '../third_party/angle/angle.isolate', 114 '../third_party/angle/angle.isolate',
119 ], 115 ],
120 } 116 }
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