aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-02-07 13:31:23 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-07 13:31:23 -0800
commit4e79f334525d722358adc62c0d0b14c38853812d (patch)
treecd2ff2fb13752e1897919e11180682c32c350a79 /platform_tools
parent2afbe23753bf97402a47408c83107042eea3c476 (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 'platform_tools')
-rw-r--r--platform_tools/android/gyp/dependencies.gypi27
1 files changed, 1 insertions, 26 deletions
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index eb34f10cd7..49937b0f68 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -33,7 +33,7 @@
'cflags': [
'-w',
],
- },
+ },
{
'target_name': 'cpu_features',
'type': 'static_library',
@@ -64,31 +64,6 @@
},
},
{
- 'target_name': 'expat',
- 'type': 'static_library',
- 'sources': [
- '../third_party/externals/expat/lib/xmlparse.c',
- '../third_party/externals/expat/lib/xmlrole.c',
- '../third_party/externals/expat/lib/xmltok.c',
- ],
- 'include_dirs': [
- '../third_party/externals/expat',
- '../third_party/externals/expat/lib',
- ],
- 'cflags': [
- '-w',
- '-fexceptions',
- ],
- 'defines': [
- 'HAVE_EXPAT_CONFIG_H',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/externals/expat/lib', # For expat.h
- ],
- }
- },
- {
# This target is a dependency for all console-type Skia applications which
# will run on Android. Since Android requires us to load native code in
# shared libraries, we need a common entry point to wrap around main().