diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-22 14:43:58 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-22 14:43:58 +0000 |
| commit | a22282ccd0e22cb9882e66e53058c1fadf71219f (patch) | |
| tree | 4a6f72ca545af1a8902a0f07678574b8519c9eaa /net/net.gyp | |
| parent | d1049d07f0cb04b1d1643e74c10122f9e5563ec7 (diff) | |
| download | chromium_src-a22282ccd0e22cb9882e66e53058c1fadf71219f.zip chromium_src-a22282ccd0e22cb9882e66e53058c1fadf71219f.tar.gz chromium_src-a22282ccd0e22cb9882e66e53058c1fadf71219f.tar.bz2 | |
Shuffle media-related WebMimeRegistry code from webkit/ to content/.
TestShellWebMimeRegistryImpl has been replaced in lieu of content_shell calling net::RemoveProprietaryMediaTypesAndCodecsForTests().
BUG=251306
Review URL: https://chromiumcodereview.appspot.com/17447011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/net.gyp b/net/net.gyp index 758419e..1d6d0d0 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1414,11 +1414,6 @@ 'include_dirs': [ '../third_party/openssl', ], - }, { # else OS != "android" - 'defines': [ - # These are the features Android doesn't support. - 'ENABLE_MEDIA_CODEC_THEORA', - ], }, ], ], |