Index: skia/skia.gyp |
diff --git a/skia/skia.gyp b/skia/skia.gyp |
index 17c817a3c575081c93bd1c9f038d322051d4d9e9..73cff9828e7cc634c125e8d47b3eb5753d142d8f 100644 |
--- a/skia/skia.gyp |
+++ b/skia/skia.gyp |
@@ -929,6 +929,15 @@ |
'../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', |
], |
}], |
+ [ 'OS == "ios"', { |
stuartmorgan
2012/07/31 13:57:53
How about moving this down to just before "android
|
+ 'sources/': [ |
+ # iOS does not require most of skia and only needs a single file. |
+ # Rather than creating a separate top-level target, simply exclude |
+ # all files except for the one that is needed. |
+ ['exclude', '.*'], |
+ ['include', '^ext/google_logging\\.cc$'], |
+ ], |
+ }], |
[ 'use_aura == 1 and use_canvas_skia == 1', { |
'sources/': [ |
['exclude', 'ext/platform_canvas_mac\\.cc$'], |
@@ -1003,7 +1012,7 @@ |
}], |
], |
}], |
- [ 'OS == "mac"', { |
+ [ 'OS == "mac" and OS != "ios"', { |
'defines': [ |
'SK_BUILD_FOR_MAC', |
], |
@@ -1072,12 +1081,15 @@ |
], |
}, |
}], |
- ], |
- 'dependencies': [ |
- 'skia_opts', |
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
- '../third_party/sfntly/sfntly.gyp:sfntly', |
- '../third_party/zlib/zlib.gyp:zlib', |
+ ['OS != "ios"', { |
+ |
+ 'dependencies': [ |
+ 'skia_opts', |
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
+ '../third_party/sfntly/sfntly.gyp:sfntly', |
+ '../third_party/zlib/zlib.gyp:zlib', |
+ ], |
+ }], |
], |
'direct_dependent_settings': { |
'include_dirs': [ |