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

Unified Diff: content/content_common.gypi

Issue 18873009: Revert "Revert "Remove dependencies on /media for iOS."" (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Re-upload patch Created 7 years, 4 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/browser/browser_main_loop.cc ('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_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 18ecdeaa036c638bb63b5721eb7cf92ef479fd9c..a4f7a42e1c7d92acb9f4b8ac19aba7865e73d5cf 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -6,7 +6,6 @@
'dependencies': [
'../base/base.gyp:base',
'../components/tracing.gyp:tracing',
- '../media/media.gyp:media',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icuuc',
@@ -395,6 +394,7 @@
'../gpu/gpu.gyp:gles2_implementation',
'../gpu/gpu.gyp:gpu_ipc',
'../ipc/ipc.gyp:ipc',
+ '../media/media.gyp:media',
'../media/media.gyp:shared_memory_support',
'../third_party/WebKit/public/blink.gyp:blink_minimal',
'../ui/gl/gl.gyp:gl',
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698