Upstream: Make expat compiled in Android

BUG=None
TEST=None


Review URL: http://codereview.chromium.org/8620004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111206 0039d316-1c4b-4281-b951-d872f2087c98

third_party/expat/expat.gyp

@@ -1,4 +1,4 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -15,7 +15,7 @@
     ]
   },
   'conditions': [
-    ['os_posix == 1 and OS != "mac"', {
+    ['os_posix == 1 and OS != "mac" and OS != "android"', {
       # On Linux, we implicitly already depend on expat via fontconfig;
       # let's not pull it in twice.
       'targets': [
@@ -59,7 +59,7 @@
                 'COMPILED_FROM_DSP',
               ],
             }],
-            ['OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
+            ['OS=="mac" or OS=="android" or OS=="freebsd" or OS=="openbsd"', {
               'defines': [
                 'HAVE_EXPAT_CONFIG_H',
               ],