diff options
| author |  mtklein <mtklein@chromium.org> | 2016-02-07 13:31:23 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-07 13:31:23 -0800 |
| commit | 4e79f334525d722358adc62c0d0b14c38853812d (patch) | |
| tree | cd2ff2fb13752e1897919e11180682c32c350a79 /gyp | |
| parent | 2afbe23753bf97402a47408c83107042eea3c476 (diff) | |
msan: build expat from source
This should let us test it on the MSAN bot.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1674053002
CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot
Review URL: https://codereview.chromium.org/1674053002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/expat.gyp | 25 | ||||
| -rw-r--r-- | gyp/ports.gyp | 14 |
2 files changed, 29 insertions, 10 deletions
diff --git a/gyp/expat.gyp b/gyp/expat.gyp new file mode 100644 index 0000000000..9e18383db3 --- /dev/null +++ b/gyp/expat.gyp @@ -0,0 +1,25 @@ +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# 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' ], + 'sources': [ + '../third_party/externals/expat/lib/xmlparse.c', + '../third_party/externals/expat/lib/xmlrole.c', + '../third_party/externals/expat/lib/xmltok.c', + ], + 'direct_dependent_settings': { + 'include_dirs': [ '../third_party/externals/expat/lib' ], + }, + }] +} diff --git a/gyp/ports.gyp b/gyp/ports.gyp index 0c2d099380..2c41ecfbf1 100644 --- a/gyp/ports.gyp +++ b/gyp/ports.gyp @@ -88,17 +88,11 @@ 'freetype.gyp:freetype', ], 'conditions': [ - [ 'skia_os == "android"', { - 'dependencies': [ - 'android_deps.gyp:expat', - ], + [ 'skia_android_framework', { + 'link_settings': { 'libraries': [ '-lexpat' ] }, }, { - 'link_settings': { - 'libraries': [ - '-ldl', - '-lexpat', - ], - }, + 'link_settings': { 'libraries': [ '-ldl' ] }, + 'dependencies': [ 'expat.gyp:expat' ], }], [ 'skia_embedded_fonts', { 'variables': { |