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

Unified Diff: chrome/chrome_tests.gypi

Issue 18777006: Remove dependencies on /media for iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 5 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/chrome_browser_ui.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9ec897a4f2056e297135c5ee48fc8b6a34d1c6ac..2b2ae437772c500f6fcc1798672630a2286903a5 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3116,7 +3116,6 @@
# Disabling for now (enabled on linux/windows below).
# 'browser_tests',
'../ipc/ipc.gyp:ipc_tests',
- '../media/media.gyp:media_unittests',
'../net/net.gyp:net_unittests',
'../printing/printing.gyp:printing_unittests',
'../remoting/remoting.gyp:remoting_unittests',
@@ -3126,6 +3125,10 @@
'../sync/sync.gyp:sync_unit_tests',
], # 'dependencies'
'conditions': [
+ ['OS!="ios"', {
+ 'dependencies': [
+ '../media/media.gyp:media_unittests',
+ ]}],
['OS=="win"', {
'dependencies': [
# Courgette has not been ported from Windows.
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698