diff options
| author |  fmalita <fmalita@chromium.org> | 2016-07-14 14:02:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-14 14:02:24 -0700 |
| commit | 771a190a0021d95500d73d4f187e0ef2aa3a0fdc (patch) | |
| tree | 2c2f62bd418e0bce2ff1973ac25b60882729448b /gyp/expat.gyp | |
| parent | 4c7e117b696b67d45dc939e8b516f6ae18e68d1a (diff) | |
Build Expat on all platforms
* bump version to @android-6.0.1_r55 (2.1.1)
* add as a dependency to the 'xml' target (for upcoming http://crrev.com/2142893006)
* tweak build for Mac, Win:
- define HAVE_EXPAT_CONFIG_H (same as in Android.mk)
- use -Wno-missing-field-initializers (same as in Android.mk)
- suppress MSVS warning 4244 (same as ..cmake/Utilities/cmexpat/expatConfig.h.in)
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150603004
R=mtklein@google.com
Review-Url: https://codereview.chromium.org/2150603004
Diffstat (limited to 'gyp/expat.gyp')
| -rw-r--r-- | gyp/expat.gyp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gyp/expat.gyp b/gyp/expat.gyp index 9e18383db3..90f7b02fbc 100644 --- a/gyp/expat.gyp +++ b/gyp/expat.gyp @@ -4,15 +4,18 @@ # found in the LICENSE file. # Build expat from source. -# Used on Linux bots for testing the Android FontMgr xml parsing. -# This is mostly important for the MSAN bot's instrumentation. { 'targets': [{ 'target_name': 'expat', 'type': 'static_library', - 'cflags': [ '-w' ], - 'defines': [ 'HAVE_MEMMOVE' ], + 'cflags': [ '-Wno-missing-field-initializers' ], + 'xcode_settings': { 'WARNING_CFLAGS': [ '-Wno-missing-field-initializers', ], }, + 'msvs_disabled_warnings': [4244], + 'defines': [ 'HAVE_EXPAT_CONFIG_H' ], + 'include_dirs': [ + '../third_party/externals/expat', + ], 'sources': [ '../third_party/externals/expat/lib/xmlparse.c', '../third_party/externals/expat/lib/xmlrole.c', |