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

Side by Side Diff: media/media_unittests.isolate

Issue 601263002: Update content and media unittest isolate targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflict Created 6 years, 2 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.gyp ('k') | no next file » | 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': [
6 '../base/base.isolate',
7 ],
5 'conditions': [ 8 'conditions': [
6 ['OS=="android"', { 9 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
7 'variables': { 10 'variables': {
8 'isolate_dependency_untracked': [ 11 'isolate_dependency_untracked': [
9 'test/data/', 12 'test/data/',
10 ], 13 ],
11 }, 14 },
12 }], 15 }],
16 ['OS=="linux" or OS=="mac" or OS=="win"', {
17 'variables': {
18 'command': [
19 '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
20 ],
21 'isolate_dependency_tracked': [
22 '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
23 ],
24 },
25 }],
26 # TODO(jmadill): find why ffmpeg dll dependency is untracked
27 ['OS=="win"', {
28 'variables': {
29 'isolate_dependency_untracked': [
30 '<(PRODUCT_DIR)/ffmpegsumo.dll',
csharp 2014/09/26 15:01:16 is ffmpedsumo.dll required to run the test? If so,
31 ],
32 },
33 }],
13 ], 34 ],
14 } 35 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698