From d2effadd83accd3df875694437ca766bb20cb6e1 Mon Sep 17 00:00:00 2001
From: "michaelbai@google.com"
 <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 11 Jul 2011 22:47:57 +0000
Subject: 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
---
 net/net.gyp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'net/net.gyp')

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',
+            ],
+          },
+        ],
       ],
     },
     {
-- 
cgit v1.1