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

Side by Side Diff: components/components_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 | « chromecast/media/cma/test/run_all_unittests.cc ('k') | components/html_viewer/media_factory.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)/components_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 'variables': { 47 'variables': {
48 'files': [ 48 'files': [
49 '../testing/test_env.py', 49 '../testing/test_env.py',
50 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)', 50 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
51 ], 51 ],
52 }, 52 },
53 }], 53 }],
54 ['OS=="linux"', { 54 ['OS=="linux"', {
55 'variables': { 55 'variables': {
56 'files': [ 56 'files': [
57 '<(PRODUCT_DIR)/libffmpegsumo.so',
57 '<(PRODUCT_DIR)/libosmesa.so', 58 '<(PRODUCT_DIR)/libosmesa.so',
58 ], 59 ],
59 }, 60 },
60 }], 61 }],
61 ['OS=="mac"', { 62 ['OS=="mac"', {
62 'variables': { 63 'variables': {
63 'files': [ 64 'files': [
65 '<(PRODUCT_DIR)/ffmpegsumo.so',
64 '<(PRODUCT_DIR)/osmesa.so', 66 '<(PRODUCT_DIR)/osmesa.so',
65 ], 67 ],
66 }, 68 },
67 }], 69 }],
68 ['OS=="win"', { 70 ['OS=="win"', {
69 'variables': { 71 'variables': {
70 'files': [ 72 'files': [
71 '../chrome/test/data/policy/', 73 '../chrome/test/data/policy/',
74 '<(PRODUCT_DIR)/ffmpegsumo.dll',
72 '<(PRODUCT_DIR)/osmesa.dll', 75 '<(PRODUCT_DIR)/osmesa.dll',
73 ], 76 ],
74 }, 77 },
75 }], 78 }],
76 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 79 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
77 'variables': { 80 'variables': {
78 'files': [ 81 'files': [
79 '<(PRODUCT_DIR)/components_unittests.exe.pdb', 82 '<(PRODUCT_DIR)/components_unittests.exe.pdb',
80 ], 83 ],
81 }, 84 },
82 }], 85 }],
83 ['OS=="mac" and asan==1 and fastbuild==0', { 86 ['OS=="mac" and asan==1 and fastbuild==0', {
84 'variables': { 87 'variables': {
85 'files': [ 88 'files': [
86 '<(PRODUCT_DIR)/components_unittests.dSYM/', 89 '<(PRODUCT_DIR)/components_unittests.dSYM/',
90 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
87 '<(PRODUCT_DIR)/osmesa.so.dSYM/', 91 '<(PRODUCT_DIR)/osmesa.so.dSYM/',
88 ], 92 ],
89 }, 93 },
90 }], 94 }],
91 ], 95 ],
92 'includes': [ 96 'includes': [
93 '../base/base.isolate', 97 '../base/base.isolate',
94 '../third_party/angle/angle.isolate', 98 '../third_party/angle/angle.isolate',
95 ], 99 ],
96 } 100 }
OLDNEW
« no previous file with comments | « chromecast/media/cma/test/run_all_unittests.cc ('k') | components/html_viewer/media_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698