Speculatively fix Android automerger

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2155713004

Review-Url: https://codereview.chromium.org/2155713004
This commit is contained in:
msarett 2016-07-15 14:18:49 -07:00 committed by Commit bot
parent 9ce3a543c9
commit 80d46ccb28
2 changed files with 3 additions and 3 deletions

View File

@ -31,7 +31,7 @@
],
'targets': [
{
'target_name': 'expat',
'target_name': 'expat_android',
'type': 'none',
'direct_dependent_settings': {
'libraries' : [

View File

@ -12,8 +12,8 @@
'type': 'none',
'conditions': [
[ 'skia_android_framework', {
'dependencies': [ 'android_deps.gyp:expat' ],
'export_dependent_settings': [ 'android_deps.gyp:expat' ],
'dependencies': [ 'android_deps.gyp:expat_android' ],
'export_dependent_settings': [ 'android_deps.gyp:expat_android' ],
},{
'dependencies': [ 'expat.gyp:expat_static' ],
'export_dependent_settings': [ 'expat.gyp:expat_static' ],