diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 16:49:23 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 16:49:23 +0000 |
| commit | 1f99bc28b47392ed97d03863460bc681d7f39a1a (patch) | |
| tree | 7e8b989240415d3b6118d04a76a2b2f01958549a /build/all.gyp | |
| parent | 6b07fa26f4aa1a98e0aeb39c14ae6385d09e25a0 (diff) | |
| download | chromium_src-1f99bc28b47392ed97d03863460bc681d7f39a1a.zip chromium_src-1f99bc28b47392ed97d03863460bc681d7f39a1a.tar.gz chromium_src-1f99bc28b47392ed97d03863460bc681d7f39a1a.tar.bz2 | |
Revert "Remove dependencies on /media for iOS."
This reverts commit 5acb0a7605d1eec9220e0b7b3b663967fcf1e5ce.
We need to stop media_unittests running on the iOS simulator bot before we can
safely reland this CL.
TBR=bdibello
Review URL: https://codereview.chromium.org/19002008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 3a0858a..3818816 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -14,6 +14,7 @@ '../chrome/chrome.gyp:*', '../content/content.gyp:*', '../crypto/crypto.gyp:*', + '../media/media.gyp:*', '../net/net.gyp:*', '../sdch/sdch.gyp:*', '../sql/sql.gyp:*', @@ -40,7 +41,6 @@ '../gpu/tools/tools.gyp:*', '../ipc/ipc.gyp:*', '../jingle/jingle.gyp:*', - '../media/media.gyp:*', '../ppapi/ppapi.gyp:*', '../ppapi/ppapi_internal.gyp:*', '../printing/printing.gyp:*', @@ -207,6 +207,7 @@ '../base/base.gyp:base_unittests', '../chrome/chrome.gyp:unit_tests', '../crypto/crypto.gyp:crypto_unittests', + '../media/media.gyp:media_unittests', '../net/net.gyp:net_unittests', '../sql/sql.gyp:sql_unittests', '../ui/ui.gyp:ui_unittests', @@ -231,7 +232,6 @@ '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', - '../media/media.gyp:media_unittests', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', |