libpng 1.6.3

third_party/libpng/libpng.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'libpng',
+      'toolsets': ['target', 'host'],
       'dependencies': [
         '../zlib/zlib.gyp:zlib',
       ],
       'defines': [
         'CHROME_PNG_WRITE_SUPPORT',
         'PNG_USER_CONFIG',
       ],
       'sources': [
         'png.c',
         'png.h',
@@ skipping 41 matching lines @@
         }],
         ['OS=="win" and component=="shared_library"', {
           'defines': [
             'PNG_BUILD_DLL',
             'PNG_NO_MODULEDEF',
           ],
           'direct_dependent_settings': {
             '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',
+          ],
         }],
       ],
     },
   ]
 }