Index: build/all.gyp |
diff --git a/build/all.gyp b/build/all.gyp |
index 3d0fa752cd39f3f4cf67393f681fd520867af024..27a8a4ac8c0324e9ed2ca5e0808e647d4afc8b19 100644 |
--- a/build/all.gyp |
+++ b/build/all.gyp |
@@ -14,7 +14,6 @@ |
'../chrome/chrome.gyp:*', |
'../content/content.gyp:*', |
'../crypto/crypto.gyp:*', |
- '../media/media.gyp:*', |
'../net/net.gyp:*', |
'../sdch/sdch.gyp:*', |
'../sql/sql.gyp:*', |
@@ -41,6 +40,7 @@ |
'../gpu/tools/tools.gyp:*', |
'../ipc/ipc.gyp:*', |
'../jingle/jingle.gyp:*', |
+ '../media/media.gyp:*', |
'../ppapi/ppapi.gyp:*', |
'../ppapi/ppapi_internal.gyp:*', |
'../printing/printing.gyp:*', |
@@ -207,7 +207,6 @@ |
'../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', |
@@ -232,6 +231,7 @@ |
'../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', |