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

Side by Side Diff: cc/cc_unittests.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 | « ash/ash_unittests.isolate ('k') | cc/trees/layer_tree_host_impl_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)/cc_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)',
(...skipping 28 matching lines...) Expand all
39 'files': [ 39 'files': [
40 'test/data/', 40 'test/data/',
41 '../testing/test_env.py', 41 '../testing/test_env.py',
42 '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)', 42 '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)',
43 ], 43 ],
44 }, 44 },
45 }], 45 }],
46 ['OS=="linux"', { 46 ['OS=="linux"', {
47 'variables': { 47 'variables': {
48 'files': [ 48 'files': [
49 '<(PRODUCT_DIR)/libffmpegsumo.so',
49 '<(PRODUCT_DIR)/libosmesa.so', 50 '<(PRODUCT_DIR)/libosmesa.so',
50 ], 51 ],
51 }, 52 },
52 }], 53 }],
53 ['OS=="mac"', { 54 ['OS=="mac"', {
54 'variables': { 55 'variables': {
55 'files': [ 56 'files': [
57 '<(PRODUCT_DIR)/ffmpegsumo.so',
56 '<(PRODUCT_DIR)/osmesa.so', 58 '<(PRODUCT_DIR)/osmesa.so',
57 ], 59 ],
58 }, 60 },
59 }], 61 }],
60 ['OS=="win"', { 62 ['OS=="win"', {
61 'variables': { 63 'variables': {
62 'files': [ 64 'files': [
65 '<(PRODUCT_DIR)/ffmpegsumo.dll',
63 '<(PRODUCT_DIR)/osmesa.dll', 66 '<(PRODUCT_DIR)/osmesa.dll',
64 ], 67 ],
65 }, 68 },
66 }], 69 }],
67 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 70 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
68 'variables': { 71 'variables': {
69 'files': [ 72 'files': [
70 '<(PRODUCT_DIR)/cc_unittests.exe.pdb', 73 '<(PRODUCT_DIR)/cc_unittests.exe.pdb',
71 ], 74 ],
72 }, 75 },
73 }], 76 }],
74 ['OS=="mac" and asan==1 and fastbuild==0', { 77 ['OS=="mac" and asan==1 and fastbuild==0', {
75 'variables': { 78 'variables': {
76 'files': [ 79 'files': [
77 '<(PRODUCT_DIR)/cc_unittests.dSYM/', 80 '<(PRODUCT_DIR)/cc_unittests.dSYM/',
78 ], 81 ],
79 }, 82 },
80 }], 83 }],
81 ], 84 ],
82 'includes': [ 85 'includes': [
83 '../base/base.isolate', 86 '../base/base.isolate',
84 '../third_party/angle/angle.isolate', 87 '../third_party/angle/angle.isolate',
85 ], 88 ],
86 } 89 }
OLDNEW
« no previous file with comments | « ash/ash_unittests.isolate ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698