AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix broken Android framework build.

Browse Source 
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2153953002

Review-Url: https://codereview.chromium.org/2153953002
This commit is contained in:
djsollen 2016-07-15 12:52:34 -07:00 committed by Commit bot
parent 04d62182fe
commit ec58b86437
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gyp/expat.gyp
View File

@ -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', ], },

6
gyp/ports.gyp
View File

@ -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': {