diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/media/media_perftests.isolate | |
parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/media/media_perftests.isolate')
-rw-r--r-- | chromium/media/media_perftests.isolate | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/chromium/media/media_perftests.isolate b/chromium/media/media_perftests.isolate new file mode 100644 index 00000000000..0aa38c0eb60 --- /dev/null +++ b/chromium/media/media_perftests.isolate @@ -0,0 +1,14 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'conditions': [ + ['OS=="android"', { + 'variables': { + 'isolate_dependency_untracked': [ + 'test/data/', + ], + }, + }], + ], +} |