diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 20:47:48 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 20:47:48 +0000 |
| commit | 9fc72569a6d12b675faa72bdb6845ae92247d963 (patch) | |
| tree | 9b46e5b253ebd05eb6a94d414ae10cf3ff135cb8 | |
| parent | a93089b1049d0a6dd1fe11436caf8793d33b5fac (diff) | |
| download | chromium_src-9fc72569a6d12b675faa72bdb6845ae92247d963.zip chromium_src-9fc72569a6d12b675faa72bdb6845ae92247d963.tar.gz chromium_src-9fc72569a6d12b675faa72bdb6845ae92247d963.tar.bz2 | |
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
| -rw-r--r-- | third_party/expat/expat.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp index b4f2cd5..f5498d0 100644 --- a/third_party/expat/expat.gyp +++ b/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', ], |