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

Unified Diff: skia/skia.gyp

Issue 10832081: Modifications to get skia headers compiling on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove redundant condition. Created 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 17c817a3c575081c93bd1c9f038d322051d4d9e9..824a7482356e9ba5f6492d8636f2a247ea402a40 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -1003,6 +1003,15 @@
}],
],
}],
+ [ 'OS == "ios"', {
+ '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$'],
+ ],
+ }],
[ 'OS == "mac"', {
'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': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698