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

Side by Side Diff: media/media_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 | « media/media_nacl.gyp ('k') | media/mojo/services/renderer_config_default.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'includes': [ 5 'includes': [
6 '../base/base.isolate', 6 '../base/base.isolate',
7 ], 7 ],
8 'conditions': [ 8 'conditions': [
9 ['use_x11==0', { 9 ['use_x11==0', {
10 'variables': { 10 'variables': {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 }, 45 },
46 }], 46 }],
47 ['OS=="linux" or OS=="mac" or OS=="win"', { 47 ['OS=="linux" or OS=="mac" or OS=="win"', {
48 'variables': { 48 'variables': {
49 'files': [ 49 'files': [
50 '../testing/test_env.py', 50 '../testing/test_env.py',
51 '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)', 51 '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
52 ], 52 ],
53 }, 53 },
54 }], 54 }],
55 ['OS=="linux"', {
56 'variables': {
57 'files': [
58 '<(PRODUCT_DIR)/libffmpegsumo.so',
59 ],
60 },
61 }],
62 ['OS=="mac"', {
63 'variables': {
64 'files': [
65 '<(PRODUCT_DIR)/ffmpegsumo.so',
66 ],
67 },
68 }],
69 ['OS=="win"', {
70 'variables': {
71 'files': [
72 '<(PRODUCT_DIR)/ffmpegsumo.dll',
73 ],
74 },
75 }],
76 ['OS=="mac" and asan==1 and fastbuild==0', { 55 ['OS=="mac" and asan==1 and fastbuild==0', {
77 'variables': { 56 'variables': {
78 'files': [ 57 'files': [
79 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
80 '<(PRODUCT_DIR)/media_unittests.dSYM/', 58 '<(PRODUCT_DIR)/media_unittests.dSYM/',
81 ], 59 ],
82 }, 60 },
83 }], 61 }],
84 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 62 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
85 'variables': { 63 'variables': {
86 'files': [ 64 'files': [
87 '<(PRODUCT_DIR)/media_unittests.exe.pdb', 65 '<(PRODUCT_DIR)/media_unittests.exe.pdb',
88 ], 66 ],
89 }, 67 },
90 }], 68 }],
91 ], 69 ],
92 } 70 }
OLDNEW
« no previous file with comments | « media/media_nacl.gyp ('k') | media/mojo/services/renderer_config_default.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698