Upstream: Make expat compiled in Android

third_party/expat/expat.gyp

 # Copyright (c) 2009 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.
 
 {
   'target_defaults': {
     'defines': [
       '_LIB',
       'XML_STATIC',  # Compile for static linkage.
     ],
     'include_dirs': [
       'files/lib',
     ],
     'dependencies': [
     ]
   },
   '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': [
         {
           'target_name': 'expat',
           'type': 'none',
           'link_settings': {
             'libraries': [
               '-lexpat',
             ],
@@ skipping 23 matching lines @@
             'defines': [
               'XML_STATIC',  # Tell dependants to expect static linkage.
             ],
           },
           'conditions': [
             ['OS=="win"', {
               'defines': [
                 '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',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }