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

Side by Side Diff: testing/chromoting/chromoting_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 | « remoting/host/remoting_me2me_host.cc ('k') | tools/metrics/histograms/histograms.xml » ('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) 2014 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2014 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 ['OS=="linux"', { 6 ['OS=="linux"', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 './browser_tests_launcher.py', 9 './browser_tests_launcher.py',
10 '--commands_file', 10 '--commands_file',
11 './browser_test_commands_linux.txt', 11 './browser_test_commands_linux.txt',
12 '--prod_dir', 12 '--prod_dir',
13 '<(PRODUCT_DIR)', 13 '<(PRODUCT_DIR)',
14 '--cfg_file', 14 '--cfg_file',
15 '../../remoting/tools/internal/test-account-host-config.json', 15 '../../remoting/tools/internal/test-account-host-config.json',
16 '--me2me_manifest_file', 16 '--me2me_manifest_file',
17 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json', 17 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
18 '--it2me_manifest_file', 18 '--it2me_manifest_file',
19 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json', 19 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
20 '--user_profile_dir', 20 '--user_profile_dir',
21 '/tmp/chromoting_test_profile', 21 '/tmp/chromoting_test_profile',
22 ], 22 ],
23 'files': [ 23 'files': [
24 '../xvfb.py', 24 '../xvfb.py',
25 './browser_tests_launcher.py', 25 './browser_tests_launcher.py',
26 './browser_test_commands_linux.txt', 26 './browser_test_commands_linux.txt',
27 '<(PRODUCT_DIR)/libffmpegsumo.so',
27 '<(PRODUCT_DIR)/libosmesa.so', 28 '<(PRODUCT_DIR)/libosmesa.so',
28 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 29 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
29 '../../remoting/tools/internal/test-account-host-config.json', 30 '../../remoting/tools/internal/test-account-host-config.json',
30 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json', 31 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
31 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json', 32 '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
32 '<(PRODUCT_DIR)/remoting-me2me-host.deb', 33 '<(PRODUCT_DIR)/remoting-me2me-host.deb',
33 '<(PRODUCT_DIR)/nacl_helper', 34 '<(PRODUCT_DIR)/nacl_helper',
34 '<(PRODUCT_DIR)/nacl_helper_bootstrap', 35 '<(PRODUCT_DIR)/nacl_helper_bootstrap',
35 '<(PRODUCT_DIR)/pnacl/', 36 '<(PRODUCT_DIR)/pnacl/',
36 '../../remoting/internal/config/', 37 '../../remoting/internal/config/',
(...skipping 26 matching lines...) Expand all
63 'files': [ 64 'files': [
64 '<(PRODUCT_DIR)/chrome_100_percent.pak', 65 '<(PRODUCT_DIR)/chrome_100_percent.pak',
65 '<(PRODUCT_DIR)/locales/en-US.pak', 66 '<(PRODUCT_DIR)/locales/en-US.pak',
66 ], 67 ],
67 }, 68 },
68 }], 69 }],
69 ['OS=="win"', { 70 ['OS=="win"', {
70 'variables': { 71 'variables': {
71 'files': [ 72 'files': [
72 '<(PRODUCT_DIR)/chrome_elf.dll', 73 '<(PRODUCT_DIR)/chrome_elf.dll',
74 '<(PRODUCT_DIR)/ffmpegsumo.dll',
73 '<(PRODUCT_DIR)/libglesv2.dll', 75 '<(PRODUCT_DIR)/libglesv2.dll',
74 ], 76 ],
75 }, 77 },
76 }], 78 }],
77 ['OS=="mac"', { 79 ['OS=="mac"', {
78 'variables': { 80 'variables': {
79 'files': [ 81 'files': [
80 '<(PRODUCT_DIR)/<(mac_product_name).app/', 82 '<(PRODUCT_DIR)/<(mac_product_name).app/',
81 '<(PRODUCT_DIR)/exif.so', 83 '<(PRODUCT_DIR)/exif.so',
84 '<(PRODUCT_DIR)/ffmpegsumo.so',
82 ], 85 ],
83 }, 86 },
84 }], 87 }],
85 ['OS=="win"', { 88 ['OS=="win"', {
86 'variables': { 89 'variables': {
87 'command': [ 90 'command': [
88 '../test_env.py', 91 '../test_env.py',
89 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', 92 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
90 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch:RemoteDesktopBr owserTest.MANUAL_Auth', 93 '--gtest_filter=RemoteDesktopBrowserTest.MANUAL_Launch:RemoteDesktopBr owserTest.MANUAL_Auth',
91 '--run-manual', 94 '--run-manual',
(...skipping 26 matching lines...) Expand all
118 '<(PRODUCT_DIR)/kasko.dll', 121 '<(PRODUCT_DIR)/kasko.dll',
119 ], 122 ],
120 }, 123 },
121 }], 124 }],
122 ], 125 ],
123 'includes': [ 126 'includes': [
124 '../../base/base.isolate', 127 '../../base/base.isolate',
125 '../../gin/v8.isolate', 128 '../../gin/v8.isolate',
126 ], 129 ],
127 } 130 }
OLDNEW
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698