diff options
| author | dominikg@chromium.org <dominikg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 02:39:54 +0000 |
|---|---|---|
| committer | dominikg@chromium.org <dominikg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 02:39:54 +0000 |
| commit | 777c940a87944192afaa28904c30145bfeb54d09 (patch) | |
| tree | 7724f2607c80d2ba74e1fd1aecec1037a06f2e73 /third_party/libpng/libpng.gyp | |
| parent | 45ba988dac7de579062771deb26de442b55fa12d (diff) | |
| download | chromium_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/libpng/libpng.gyp')
| -rw-r--r-- | third_party/libpng/libpng.gyp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 38082f4..bd4e3a8 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -6,6 +6,7 @@ 'targets': [ { 'target_name': 'libpng', + 'toolsets': ['target', 'host'], 'dependencies': [ '../zlib/zlib.gyp:zlib', ], @@ -67,10 +68,18 @@ 'defines': [ 'PNG_USE_DLL', ], - }, + }, }], - ['OS=="android"', { - 'toolsets': ['target', 'host'], + ['OS=="android" and _toolset=="target"', { + 'includes': [ + "../../build/android/cpufeatures.gypi", + ], + }], + ['target_arch=="arm"', { + 'sources': [ + 'arm/arm_init.c', + 'arm/filter_neon.S', + ], }], ], }, |