Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1028)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/expat.gyp

Issue 2155713004: Speculatively fix Android automerger (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/android_deps.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/expat.gyp
diff --git a/gyp/expat.gyp b/gyp/expat.gyp
index 3eeed777b9241c4ac7ac06c8b5735230fb9b978d..b70632ace4979cf5aba2955042ff111244681011 100644
--- 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' ],
« no previous file with comments | « gyp/android_deps.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698