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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/ports.gyp

Issue 2153953002: Fix broken Android framework build. (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/expat.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/ports.gyp
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 536ae9ce492446c988e282ca622e039657d49388..430176e63ac42befe01c76074d608c71bf81f8ce 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': {
« no previous file with comments | « gyp/expat.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698