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

Side by Side Diff: media/cast/cast_unittests.isolate

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
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 | « media/blink/run_all_unittests.cc ('k') | media/cast/sender/audio_encoder_unittest.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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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)/cast_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
(...skipping 16 matching lines...) Expand all
27 '--asan=<(asan)', 27 '--asan=<(asan)',
28 '--msan=<(msan)', 28 '--msan=<(msan)',
29 '--tsan=<(tsan)', 29 '--tsan=<(tsan)',
30 ], 30 ],
31 'files': [ 31 'files': [
32 '../../testing/xvfb.py', 32 '../../testing/xvfb.py',
33 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 33 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
34 ], 34 ],
35 }, 35 },
36 }], 36 }],
37 ['OS=="linux"', {
38 'variables': {
39 'files': [
40 '<(PRODUCT_DIR)/libffmpegsumo.so',
41 ],
42 },
43 }],
44 ['OS=="linux" or OS=="mac" or OS=="win"', { 37 ['OS=="linux" or OS=="mac" or OS=="win"', {
45 'variables': { 38 'variables': {
46 'files': [ 39 'files': [
47 '../../testing/test_env.py', 40 '../../testing/test_env.py',
48 '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)', 41 '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
49 ], 42 ],
50 }, 43 },
51 }], 44 }],
52 ['OS=="mac"', {
53 'variables': {
54 'files': [
55 '<(PRODUCT_DIR)/ffmpegsumo.so',
56 ],
57 },
58 }],
59 ['OS=="mac" and asan==1 and fastbuild==0', { 45 ['OS=="mac" and asan==1 and fastbuild==0', {
60 'variables': { 46 'variables': {
61 'files': [ 47 'files': [
62 '<(PRODUCT_DIR)/cast_unittests.dSYM/', 48 '<(PRODUCT_DIR)/cast_unittests.dSYM/',
63 ], 49 ],
64 }, 50 },
65 }], 51 }],
66 ['OS=="win"', {
67 'variables': {
68 'files': [
69 '<(PRODUCT_DIR)/ffmpegsumo.dll',
70 ],
71 },
72 }],
73 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 52 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
74 'variables': { 53 'variables': {
75 'files': [ 54 'files': [
76 '<(PRODUCT_DIR)/cast_unittests.exe.pdb', 55 '<(PRODUCT_DIR)/cast_unittests.exe.pdb',
77 ], 56 ],
78 }, 57 },
79 }], 58 }],
80 ], 59 ],
81 'includes': [ 60 'includes': [
82 '../../base/base.isolate', 61 '../../base/base.isolate',
83 ], 62 ],
84 } 63 }
OLDNEW
« no previous file with comments | « media/blink/run_all_unittests.cc ('k') | media/cast/sender/audio_encoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698