CL for perf tryjob on android

third_party/libpng/libpng.gyp

Index: third_party/libpng/libpng.gyp
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
index 48b3fa409c24e80d9df8e0c4623f634943c8de82..8d8dd9d460aedad58fa7fc4df2571469c89f4f13 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',
       ],
@@ -15,25 +16,26 @@
       },
       'defines': [
         'CHROME_PNG_WRITE_SUPPORT',
-        'PNG_USER_CONFIG',
       ],
       'sources': [
         'png.c',
         'png.h',
         'pngconf.h',
+        'pngdebug.h',
         'pngerror.c',
-        'pnggccrd.c',
         'pngget.c',
+        'pnginfo.h',
+        'pnglibconf.h',
         'pngmem.c',
         'pngpread.c',
+        'pngpriv.h',
         'pngread.c',
         'pngrio.c',
         'pngrtran.c',
         'pngrutil.c',
         'pngset.c',
+        'pngstruct.h',
         'pngtrans.c',
-        'pngusr.h',
-        'pngvcrd.c',
         'pngwio.c',
         'pngwrite.c',
         'pngwtran.c',
@@ -74,7 +76,6 @@
           },
         }],
         ['OS=="android"', {
-          'toolsets': ['target', 'host'],
           'defines': [
             'CHROME_PNG_READ_PACK_SUPPORT',  # Required by freetype.
           ],
@@ -84,6 +85,21 @@
             ],
           },
         }],
+        ['_toolset=="target" and (target_arch=="arm" or target_arch=="arm64" or target_arch=="armv7")', {
+          'sources': [
+            'arm/arm_init.c',
+            'arm/filter_neon.S',
+            'arm/filter_neon_intrinsics.c',
+          ],
+          'defines': [
+            'PNG_ARM_NEON_OPT=2',
+          ],
+        }],
+        ['OS=="ios"', {
+          'defines': [
+            'PNG_ARM_NEON_OPT=0',
+          ],
+        }],
       ],
     },
   ]