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

Side by Side Diff: components/components_unittests.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 | « 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',
58 '<(PRODUCT_DIR)/libosmesa.so', 57 '<(PRODUCT_DIR)/libosmesa.so',
59 ], 58 ],
60 }, 59 },
61 }], 60 }],
62 ['OS=="mac"', { 61 ['OS=="mac"', {
63 'variables': { 62 'variables': {
64 'files': [ 63 'files': [
65 '<(PRODUCT_DIR)/ffmpegsumo.so',
66 '<(PRODUCT_DIR)/osmesa.so', 64 '<(PRODUCT_DIR)/osmesa.so',
67 ], 65 ],
68 }, 66 },
69 }], 67 }],
70 ['OS=="win"', { 68 ['OS=="win"', {
71 'variables': { 69 'variables': {
72 'files': [ 70 'files': [
73 '../chrome/test/data/policy/', 71 '../chrome/test/data/policy/',
74 '<(PRODUCT_DIR)/ffmpegsumo.dll',
75 '<(PRODUCT_DIR)/osmesa.dll', 72 '<(PRODUCT_DIR)/osmesa.dll',
76 ], 73 ],
77 }, 74 },
78 }], 75 }],
79 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 76 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
80 'variables': { 77 'variables': {
81 'files': [ 78 'files': [
82 '<(PRODUCT_DIR)/components_unittests.exe.pdb', 79 '<(PRODUCT_DIR)/components_unittests.exe.pdb',
83 ], 80 ],
84 }, 81 },
85 }], 82 }],
86 ['OS=="mac" and asan==1 and fastbuild==0', { 83 ['OS=="mac" and asan==1 and fastbuild==0', {
87 'variables': { 84 'variables': {
88 'files': [ 85 'files': [
89 '<(PRODUCT_DIR)/components_unittests.dSYM/', 86 '<(PRODUCT_DIR)/components_unittests.dSYM/',
90 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
91 '<(PRODUCT_DIR)/osmesa.so.dSYM/', 87 '<(PRODUCT_DIR)/osmesa.so.dSYM/',
92 ], 88 ],
93 }, 89 },
94 }], 90 }],
95 ], 91 ],
96 'includes': [ 92 'includes': [
97 '../base/base.isolate', 93 '../base/base.isolate',
98 '../third_party/angle/angle.isolate', 94 '../third_party/angle/angle.isolate',
99 ], 95 ],
100 } 96 }
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