Speculatively fix Android automerger

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

Review-Url: https://codereview.chromium.org/2155713004

diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp
index 1a8d81b..fb15d18 100644 (file)
--- a/gyp/android_deps.gyp
+++ b/gyp/android_deps.gyp
@@ -31,7 +31,7 @@
         ],
         'targets': [
           {
-            'target_name': 'expat',
+            'target_name': 'expat_android',
             'type': 'none',
             'direct_dependent_settings': {
               'libraries' : [

diff --git a/gyp/expat.gyp b/gyp/expat.gyp
index 3eeed77..b70632a 100644 (file)
--- a/gyp/expat.gyp
+++ b/gyp/expat.gyp
@@ -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' ],