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

Unified Diff: third_party/zlib/zlib.gyp

Issue 8226018: Extract an independent webkit_support_gfx target. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix DEPS Created 9 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 | « third_party/libpng/libpng.gyp ('k') | webkit/support/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/zlib.gyp
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 69e2a5c831f5bd562f18e3d9301f22400b49005d..54d80893d82abda02501493486497cb5e0383929 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -95,6 +95,11 @@
'contrib/minizip/zip.c',
'contrib/minizip/zip.h',
],
+ 'conditions': [
+ ['OS=="android"', {
+ 'toolsets': ['target', 'host'],
+ }],
+ ],
'link_settings': {
'libraries': [
'-lz',
« no previous file with comments | « third_party/libpng/libpng.gyp ('k') | webkit/support/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698