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

Unified Diff: content/content_tests.gypi

Issue 590243002: Revert of 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 | « content/content_gl_tests.isolate ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 3c1ceb98a8f9134b6cf2bce2114734c4399acac8..2abbf780e792db9120c6ee9df46ec252c2b13a9b 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -985,27 +985,7 @@
'sources': [
'content_unittests.isolate',
],
- },
- ],
- 'conditions': [
- ['archive_gpu_tests==1', {
- 'targets': [
- {
- 'target_name': 'content_gl_tests_run',
- 'type': 'none',
- 'dependencies': [
- 'content_shell_and_tests.gyp:content_gl_tests',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'content_gl_tests.isolate',
- ],
- 'sources': [
- 'content_gl_tests.isolate',
- ],
- },
- ],
- }],
+ },
],
}],
['OS!="ios"', {
@@ -1409,12 +1389,6 @@
['OS=="android"', {
'dependencies': [
'../testing/android/native_test.gyp:native_test_native_code',
- ],
- }, {
- 'dependencies': [
- # Runtime dependencis.
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
- '../third_party/mesa/mesa.gyp:osmesa',
],
}],
],
« no previous file with comments | « content/content_gl_tests.isolate ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698