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

Unified 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: Added mac and linux ffmpegsumo dep Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media_unittests.isolate
diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate
index 0aa38c0eb6010194fc310c502892e2ebd23d44b1..92ebec1894127222fa51930a9ea102ab168c9d54 100644
--- a/media/media_unittests.isolate
+++ b/media/media_unittests.isolate
@@ -2,13 +2,48 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
+ 'includes': [
+ '../base/base.isolate',
+ ],
'conditions': [
- ['OS=="android"', {
+ ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'isolate_dependency_untracked': [
'test/data/',
],
},
}],
+ ['OS=="linux" or OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'command': [
+ '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
+ ],
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
+ ],
+ },
+ }],
+ # TODO(jmadill): should be automatic. http://crbug.com/418146
+ ['OS=="win"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/ffmpegsumo.dll',
+ ],
+ },
+ }],
+ ['OS=="mac"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/ffmpegsumo.so',
+ ],
+ },
+ }],
+ ['OS=="linux"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/libffmpegsumo.so',
+ ],
+ },
+ }],
],
}
« 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