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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/skflate.gyp

Issue 966963002: On windows, build zlib as a static library. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Eliminate deprecation warnings. Created 5 years, 10 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 | « DEPS ('k') | gyp/zlib.gyp » ('j') | gyp/zlib.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/skflate.gyp
diff --git a/gyp/skflate.gyp b/gyp/skflate.gyp
index 6ca4095d1fb948233239916a6136daad9f68cccf..beed58081f9cb6646ac9c11f6edd3988a42ae866 100644
--- a/gyp/skflate.gyp
+++ b/gyp/skflate.gyp
@@ -4,13 +4,9 @@
{
'target_name': 'skflate',
'type': 'static_library',
- 'dependencies': [ 'skia_lib.gyp:skia_lib' ],
- 'conditions': [
- [ 'skia_android_framework', {
- 'dependencies': [ 'zlib.gyp:zlib' ]
- },{
- 'dependencies': [ 'zlib.gyp:miniz' ] # Our bots.
- }],
+ 'dependencies': [
+ 'skia_lib.gyp:skia_lib',
+ 'zlib.gyp:zlib',
],
'sources': [ '../src/core/SkFlate.cpp' ],
},
« no previous file with comments | « DEPS ('k') | gyp/zlib.gyp » ('j') | gyp/zlib.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698