Instrumented libraries: fix & re-enable zlib1g build.

The version script was being ignored in non-gcc (clang) builds.

BUG=313751
TBR=glider@chromium.org
NOTRY=true

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

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

third_party/instrumented_libraries/instrumented_libraries.gyp

@@ -73,8 +73,7 @@
         '<(_sanitizer_type)-libxrender1',
         '<(_sanitizer_type)-libxss1',
         '<(_sanitizer_type)-libxtst6',
-        # https://crbug.com/313751#c110
-        #'<(_sanitizer_type)-zlib1g',
+        '<(_sanitizer_type)-zlib1g',
         '<(_sanitizer_type)-libglib2.0-0',
         '<(_sanitizer_type)-libdbus-1-3',
         '<(_sanitizer_type)-libdbus-glib-1-2',
@@ -336,6 +335,7 @@
     {
       'library_name': 'zlib1g',
       'dependencies=': [],
+      'run_before_build': 'zlib1g.sh',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {

third_party/instrumented_libraries/zlib1g.diff

+diff -rupN ./configure ../zlib-1.2.3.4.dfsg-patched/configure
+--- ./configure	2009-12-24 18:09:43.000000000 +0300
++++ ../zlib-1.2.3.4.dfsg-patched/configure	2014-06-03 17:53:45.082074669 +0400
+@@ -72,6 +72,8 @@ cflags=${CFLAGS-"-O3"}
+ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+ case "$cc" in
+   *gcc*) gcc=1 ;;
++  # Use the version script for clang builds as well.
++  *clang*) gcc=1 ;;
+ esac
+ 
+ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then

third_party/instrumented_libraries/zlib1g.sh

+#!/bin/bash
+# Copyright 2014 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.
+
+# This script does some preparations before build of instrumented zlib1g.
+
+patch -p1 < $(dirname ${BASH_SOURCE[0]})/zlib1g.diff