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

Unified Diff: content/content_gl_tests.isolate

Issue 573073003: Move content_gl_tests.isolate to content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « chrome/content_gl_tests.isolate ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_gl_tests.isolate
diff --git a/chrome/content_gl_tests.isolate b/content/content_gl_tests.isolate
similarity index 58%
rename from chrome/content_gl_tests.isolate
rename to content/content_gl_tests.isolate
index 1682a04a182c35b209e967292720c10c224a25a8..18c6b828f83848c511d668ecbcc4f1d5c0b8da24 100644
--- a/chrome/content_gl_tests.isolate
+++ b/content/content_gl_tests.isolate
@@ -2,12 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
- # TODO(kbr): including all of chrome.isolate is overkill -- the only
- # real dependency is on ffmpegsumo. However, wait to refactor
- # chrome.isolate (perhaps adding a media.isolate) for the moment.
- 'includes': [
- 'chrome.isolate',
- ],
'conditions': [
['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
@@ -30,5 +24,33 @@
],
},
}],
+ ['OS=="linux"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/libffmpegsumo.so',
+ ],
+ },
+ }],
+ ['OS=="mac"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/ffmpegsumo.so',
+ ],
+ },
+ }],
+ ['OS=="win"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/d3dcompiler_46.dll',
+ '<(PRODUCT_DIR)/libEGL.dll',
+ '<(PRODUCT_DIR)/libGLESv2.dll',
+ '<(PRODUCT_DIR)/ffmpegsumo.dll',
+ '<(PRODUCT_DIR)/osmesa.dll',
+ ],
+ },
+ }],
+ ],
+ 'includes': [
+ '../third_party/icu/icu.isolate',
],
}
« no previous file with comments | « chrome/content_gl_tests.isolate ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698