aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2015-02-10 07:51:12 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-02-10 07:51:12 -0800
commiteb2be7fa4413a566212782d8efae5dc225002821 (patch)
tree4eb8b3ac1c7a6a07a5dd58ffb1f1ebd1a343c36b /platform_tools
parentee9c49efc9c0dd15c1e1f950dd8be39a30e933a5 (diff)
Additional cleanups to Android config parsing.
Properly labels several methods as static. Use XML_GetBuffer to avoid an extra copy. Set the memory allocators to Skia's. Set define in 'defines' instead of cflags. Update debug dumper. Review URL: https://codereview.chromium.org/915443002
Diffstat (limited to 'platform_tools')
-rw-r--r--platform_tools/android/gyp/dependencies.gypi4
1 files changed, 3 insertions, 1 deletions
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index bb0db7184b..6507ee45f7 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -44,7 +44,9 @@
'cflags': [
'-w',
'-fexceptions',
- '-DHAVE_EXPAT_CONFIG_H',
+ ],
+ 'defines': [
+ 'HAVE_EXPAT_CONFIG_H',
],
'direct_dependent_settings': {
'include_dirs': [