diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 22:47:57 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 22:47:57 +0000 |
| commit | d2effadd83accd3df875694437ca766bb20cb6e1 (patch) | |
| tree | 4ae89de7105c1850bdeac35d870fcc6e1d015e1b /net/net.gyp | |
| parent | 734a36e98b8bb2dded95c0b7e4e35e82bb3f5507 (diff) | |
| download | chromium_src-d2effadd83accd3df875694437ca766bb20cb6e1.zip chromium_src-d2effadd83accd3df875694437ca766bb20cb6e1.tar.gz chromium_src-d2effadd83accd3df875694437ca766bb20cb6e1.tar.bz2 | |
Upstream android net related code (part3)
Moved from http://codereview.chromium.org/7277057/
BUG=
TEST=
Review URL: http://codereview.chromium.org/7328025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92069 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 40de019..1186975d 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -854,6 +854,19 @@ }, }, ], + [ 'OS == "android"', { + 'defines': [ + # Android can shut down our app at any time, so we persist session cookies. + 'ENABLE_PERSISTENT_SESSION_COOKIES' + ], + }, { # else OS! = "android" + 'defines': [ + # These are the features Android doesn't support. + 'ENABLE_MEDIA_CODEC_THEORA', + 'ENABLE_MEDIA_TYPE_OGG', + ], + }, + ], ], }, { |