summaryrefslogtreecommitdiffstats
path: root/third_party/zlib
diff options
context:
space:
mode:
authordominikg@chromium.org <dominikg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-24 02:39:54 +0000
committerdominikg@chromium.org <dominikg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-24 02:39:54 +0000
commit777c940a87944192afaa28904c30145bfeb54d09 (patch)
tree7724f2607c80d2ba74e1fd1aecec1037a06f2e73 /third_party/zlib
parent45ba988dac7de579062771deb26de442b55fa12d (diff)
downloadchromium_src-777c940a87944192afaa28904c30145bfeb54d09.zip
chromium_src-777c940a87944192afaa28904c30145bfeb54d09.tar.gz
chromium_src-777c940a87944192afaa28904c30145bfeb54d09.tar.bz2
libpng 1.6.3
Update libpng from version 1.2.45 to 1.6.3. Enable NEON implementation of libpng for ARM devices running Android. libpng performs a check a runtime to see if the device actually supports NEON. BUG= Review URL: https://chromiumcodereview.appspot.com/23271006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
-rw-r--r--third_party/zlib/zlib.gyp3
1 files changed, 1 insertions, 2 deletions
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 279a6e8..420547e 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -6,6 +6,7 @@
'targets': [
{
'target_name': 'zlib',
+ 'toolsets': ['target', 'host'],
'type': 'static_library',
'sources': [
'adler32.c',
@@ -47,8 +48,6 @@
'conditions': [
['OS!="win"', {
'product_name': 'chrome_zlib',
- }], ['OS=="android"', {
- 'toolsets': ['target', 'host'],
}],
],
},