diff options
| -rw-r--r-- | gyp/expat.gyp | 18 | ||||
| -rw-r--r-- | gyp/ports.gyp | 6 |
2 files changed, 18 insertions, 6 deletions
diff --git a/gyp/expat.gyp b/gyp/expat.gyp index 90e4e44f41..3eeed777b9 100644 --- a/gyp/expat.gyp +++ b/gyp/expat.gyp @@ -6,8 +6,22 @@ # Build expat from source. { - 'targets': [{ - 'target_name': 'expat', + 'targets': [ + { + 'target_name': 'expat', + 'type': 'none', + 'conditions': [ + [ 'skia_android_framework', { + 'dependencies': [ 'android_deps.gyp:expat' ], + 'export_dependent_settings': [ 'android_deps.gyp:expat' ], + },{ + 'dependencies': [ 'expat.gyp:expat_static' ], + 'export_dependent_settings': [ 'expat.gyp:expat_static' ], + }] + ] + }, + { + 'target_name': 'expat_static', 'type': 'static_library', 'cflags': [ '-Wno-missing-field-initializers' ], 'xcode_settings': { 'WARNING_CFLAGS': [ '-Wno-missing-field-initializers', ], }, diff --git a/gyp/ports.gyp b/gyp/ports.gyp index 536ae9ce49..430176e63a 100644 --- a/gyp/ports.gyp +++ b/gyp/ports.gyp @@ -86,13 +86,11 @@ ], 'dependencies': [ 'freetype.gyp:freetype', + 'expat.gyp:expat', ], 'conditions': [ - [ 'skia_android_framework', { - 'link_settings': { 'libraries': [ '-lexpat' ] }, - }, { + [ 'skia_android_framework == 0', { 'link_settings': { 'libraries': [ '-ldl' ] }, - 'dependencies': [ 'expat.gyp:expat' ], }], [ 'skia_embedded_fonts', { 'variables': { |