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

Unified Diff: third_party/zlib/zlib.gyp

Issue 23494067: Revert "libpng 1.6.3" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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/pngwutil.c ('k') | no next file » | 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 420547ed7ba05a848ef873cd14d494425ece00dd..279a6e88c73b9befc7bfd9576b3805fb46039e03 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -6,7 +6,6 @@
'targets': [
{
'target_name': 'zlib',
- 'toolsets': ['target', 'host'],
'type': 'static_library',
'sources': [
'adler32.c',
@@ -48,6 +47,8 @@
'conditions': [
['OS!="win"', {
'product_name': 'chrome_zlib',
+ }], ['OS=="android"', {
+ 'toolsets': ['target', 'host'],
}],
],
},
« no previous file with comments | « third_party/libpng/pngwutil.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698