diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 17:26:39 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 17:26:39 +0000 |
| commit | b2fea262a3fc89f56117082173c50084a054e850 (patch) | |
| tree | 87a0e1af691347d1013089d3c97a3f37c9bdcab9 | |
| parent | 2e60e29504e53a32ccc0f4a3288e93d553d0f38e (diff) | |
| download | chromium_src-b2fea262a3fc89f56117082173c50084a054e850.zip chromium_src-b2fea262a3fc89f56117082173c50084a054e850.tar.gz chromium_src-b2fea262a3fc89f56117082173c50084a054e850.tar.bz2 | |
Avoid dependency on flac, speex and ffmpeg on Android
Android does not use these third-party projects.
Review URL: https://chromiumcodereview.appspot.com/10630006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143934 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/content_browser.gypi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index d4da77e..d80203f 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -12,8 +12,6 @@ '../net/net.gyp:net', '../ppapi/ppapi_internal.gyp:ppapi_proxy', '../skia/skia.gyp:skia', - '../third_party/flac/flac.gyp:libflac', - '../third_party/speex/speex.gyp:libspeex', '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/zlib/zlib.gyp:zlib', '../ui/surface/surface.gyp:surface', @@ -852,9 +850,6 @@ ], }], ['OS=="android"', { - 'dependencies!': [ - '../third_party/flac/flac.gyp:libflac', - ], 'dependencies': [ '../media/media.gyp:media', 'content.gyp:content_jni_headers', @@ -873,6 +868,11 @@ 'browser/geolocation/network_location_request.cc', 'browser/geolocation/network_location_request.h', ], + }, { # OS!="android" + 'dependencies': [ + '../third_party/flac/flac.gyp:libflac', + '../third_party/speex/speex.gyp:libspeex', + ], }], ['OS=="mac"', { 'sources': [ |