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

Unified Diff: skia/skia_library.gypi

Issue 19477005: Improve Skia configuration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Use os_posix for posix tests. Created 7 years, 2 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 | « skia/skia_common.gypi ('k') | skia/skia_library_opts.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia_library.gypi
===================================================================
--- skia/skia_library.gypi (revision 229411)
+++ skia/skia_library.gypi (working copy)
@@ -149,9 +149,6 @@
'../third_party/skia/include/utils/SkProxyCanvas.h',
],
'include_dirs': [
- '..',
- 'config',
- '../third_party/skia/include/config',
'../third_party/skia/include/core',
'../third_party/skia/include/effects',
'../third_party/skia/include/images',
@@ -222,7 +219,7 @@
# For POSIX platforms, prefer the Mutex implementation provided by Skia
# since it does not generate static initializers.
- [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
+ [ 'os_posix == 1', {
'defines+': [
'SK_USE_POSIX_THREADS',
],
@@ -444,8 +441,6 @@
#temporary until we can hide SkFontHost
'../third_party/skia/src/core',
- 'config',
- '../third_party/skia/include/config',
'../third_party/skia/include/core',
'../third_party/skia/include/effects',
'../third_party/skia/include/pdf',
« no previous file with comments | « skia/skia_common.gypi ('k') | skia/skia_library_opts.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698