Revert "libpng 1.6.3"

This reverts commit 777c940a87944192afaa28904c30145bfeb54d09.

Many Blink LayoutTests starts failing after this patch.
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20Blink&tests=canvas/philip/tests/security.dataURI.html,canvas/philip/tests/toDataURL.arguments.1.html,canvas/philip/tests/toDataURL.arguments.2.html,canvas/philip/tests/toDataURL.arguments.3.html,canvas/philip/tests/toDataURL.bogustype.html,canvas/philip/tests/toDataURL.default.html,canvas/philip/tests/toDataURL.lowercase.ascii.html,canvas/philip/tests/toDataURL.lowercase.unicode.html,canvas/philip/tests/toDataURL.nocontext.html,canvas/philip/tests/toDataURL.png.complexcolours.html,canvas/philip/tests/toDataURL.png.html,canvas/philip/tests/toDataURL.png.primarycolours.html,canvas/philip/tests/toDataURL.unrecognised.html,compositing/overflow/image-load-overflow-scrollbars.html,compositing/overflow/invisible-descendants-should-not-affect-opt-in.html,compositing/tiling/huge-layer-img.html,css2.1/20110323/inline-replaced-width-014.htm,css2.1/t0905-c414-flt-wrap-01-d-g.html,fast/backgrounds/bgCompositeCopy.html,fast/canvas/canvas-blending-color-over-image.html,fast/canvas/canvas-blending-color-over-pattern.html,fast/canvas/canvas-blending-gradient-over-image.html,fast/canvas/canvas-blending-gradient-over-pattern.html,fast/canvas/canvas-blending-image-over-color.html,fast/canvas/canvas-blending-image-over-gradient.html,fast/canvas/canvas-blending-image-over-image.html,fast/canvas/canvas-blending-image-over-pattern.html,fast/canvas/canvas-blending-pattern-over-color.html,fast/canvas/canvas-blending-pattern-over-gradient.html,fast/canvas/canvas-blending-pattern-over-image.html,fast/canvas/canvas-blending-pattern-over-pattern.html,fast/canvas/canvas-createImageBitmap-drawImage.html,fast/canvas/canvas-createImageBitmap-immutable.html,fast/canvas/canvas-createImageBitmap-invalid-args.html,fast/canvas/canvas-createImageBitmap-out-of-bounds-src.html,fast/canvas/canvas-createImageBitmap-recursive.html,fast/canvas/canvas-createPattern-fillRect-shadow.html,fast/canvas/canvas-drawImage-out-of-bounds-src.html,fast/canvas/canvas-drawImage-shadow.html,fast/canvas/canvas-scale-drawImage-shadow.html,fast/canvas/canvas-toDataURL-case-insensitive-mimetype.html,fast/canvas/check-stale-putImageData.html,fast/canvas/toDataURL-alpha.html,fast/canvas/toDataURL-supportedTypes.html,fast/canvas/webgl/gl-teximage.html,fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html,fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html,fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html,fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html,fast/css/color-correction-on-backgrounds.html,fast/css/color-correction.html,fast/images/paint-subrect-grid.html,fast/images/png-suite/test.html,fast/images/png-with-color-profile.html,fast/images/rgb-png-with-cmyk-color-profile.html,inspector/profiler/canvas2d/canvas-get-resource-state.html,inspector/profiler/webgl/webgl-get-resource-state.html,svg/W3C-SVG-1.1/filters-blend-01-b.svg,svg/W3C-SVG-1.1/masking-path-04-b.svg,svg/dynamic-updates/SVGFEBlendElement-dom-in-attr.html,svg/dynamic-updates/SVGFEBlendElement-dom-in2-attr.html,svg/dynamic-updates/SVGFEBlendElement-dom-mode-attr.html,svg/dynamic-updates/SVGFEBlendElement-svgdom-in-prop.html,svg/dynamic-updates/SVGFEBlendElement-svgdom-in2-prop.html,svg/dynamic-updates/SVGFEBlendElement-svgdom-mode-prop.html,virtual/deferred/fast/images/paint-subrect-grid.html,virtual/deferred/fast/images/png-suite/test.html,virtual/deferred/fast/images/png-with-color-profile.html,virtual/deferred/fast/images/rgb-png-with-cmyk-color-profile.html,virtual/gpu/canvas/philip/tests/security.dataURI.html,virtual/gpu/canvas/philip/tests/toDataURL.arguments.1.html,virtual/gpu/canvas/philip/tests/toDataURL.arguments.2.html,virtual/gpu/canvas/philip/tests/toDataURL.arguments.3.html,virtual/gpu/canvas/philip/tests/toDataURL.bogustype.html,virtual/gpu/canvas/philip/tests/toDataURL.default.html,virtual/gpu/canvas/philip/tests/toDataURL.lowercase.ascii.html,virtual/gpu/canvas/philip/tests/toDataURL.lowercase.unicode.html,virtual/gpu/canvas/philip/tests/toDataURL.nocontext.html,virtual/gpu/canvas/philip/tests/toDataURL.png.complexcolours.html,virtual/gpu/canvas/philip/tests/toDataURL.png.html,virtual/gpu/canvas/philip/tests/toDataURL.png.primarycolours.html,virtual/gpu/canvas/philip/tests/toDataURL.unrecognised.html,virtual/gpu/compositedscrolling/overflow/image-load-overflow-scrollbars.html,virtual/gpu/compositedscrolling/overflow/invisible-descendants-should-not-affect-opt-in.html,virtual/gpu/fast/canvas/canvas-blending-color-over-image.html,virtual/gpu/fast/canvas/canvas-blending-color-over-pattern.html,virtual/gpu/fast/canvas/canvas-blending-gradient-over-image.html,virtual/gpu/fast/canvas/canvas-blending-gradient-over-pattern.html,virtual/gpu/fast/canvas/canvas-blending-image-over-color.html,virtual/gpu/fast/canvas/canvas-blending-image-over-gradient.html,virtual/gpu/fast/canvas/canvas-blending-image-over-image.html,virtual/gpu/fast/canvas/canvas-blending-image-over-pattern.html,virtual/gpu/fast/canvas/canvas-blending-pattern-over-color.html,virtual/gpu/fast/canvas/canvas-blending-pattern-over-gradient.html,virtual/gpu/fast/canvas/canvas-blending-pattern-over-image.html,virtual/gpu/fast/canvas/canvas-blending-pattern-over-pattern.html,virtual/gpu/fast/canvas/canvas-createImageBitmap-drawImage.html,virtual/gpu/fast/canvas/canvas-createImageBitmap-immutable.html,virtual/gpu/fast/canvas/canvas-createImageBitmap-invalid-args.html,virtual/gpu/fast/canvas/canvas-createImageBitmap-out-of-bounds-src.html,virtual/gpu/fast/canvas/canvas-createImageBitmap-recursive.html,virtual/gpu/fast/canvas/canvas-createPattern-fillRect-shadow.html,virtual/gpu/fast/canvas/canvas-drawImage-out-of-bounds-src.html,virtual/gpu/fast/canvas/canvas-scale-drawImage-shadow.html,virtual/gpu/fast/canvas/canvas-toDataURL-case-insensitive-mimetype.html,virtual/gpu/fast/canvas/check-stale-putImageData.html,virtual/gpu/fast/canvas/toDataURL-alpha.html,virtual/gpu/fast/canvas/toDataURL-supportedTypes.html,virtual/gpu/fast/canvas/webgl/gl-teximage.html,virtual/gpu/fast/canvas/webgl/premultiplyalpha-test.html,virtual/gpu/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html,virtual/gpu/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html,virtual/gpu/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html,virtual/gpu/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html,virtual/softwarecompositing/overflow/image-load-overflow-scrollbars.html,virtual/softwarecompositing/overflow/invisible-descendants-should-not-affect-opt-in.html,virtual/softwarecompositing/tiling/huge-layer-img.html

BUG=none
TBR= dominikg@chromium.org, arv@chromium.org

Review URL: https://codereview.chromium.org/23494067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224979 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 1 deletions

diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 420547e..279a6e8 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'],
         }],
       ],
     },