aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar djsollen <djsollen@google.com>2016-07-15 12:52:34 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-07-15 12:52:34 -0700
commitec58b86437d26275ade3b1455f3272754776c44d (patch)
treea2cb5731e24cf394a8f45faf0283e09a28870322
parent04d62182fe66c55d3b3e4c44e8caf0bd5f2ea111 (diff)
Fix broken Android framework build.
-rw-r--r--gyp/expat.gyp18
-rw-r--r--gyp/ports.gyp6
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': {