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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_tests.gypi

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, 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 | « no previous file | media/media.gyp » ('j') | media/media_unittests.isolate » ('J')
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 94b2a852a335c2b286ed7f93cb5bb76a41b7398a..47b046397570fed8a4c93e870f1601202340be00 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1002,6 +1002,13 @@
'sources': [
'content_unittests.isolate',
],
+ 'conditions': [
+ ['OS=="linux" and use_ozone==0', {
+ 'dependencies': [
+ '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+ ],
+ }],
+ ],
},
],
'conditions': [
« no previous file with comments | « no previous file | media/media.gyp » ('j') | media/media_unittests.isolate » ('J')

Powered by Google App Engine
This is Rietveld 408576698