Handle both OSX and iOS Simulator runtimes in the ASan postbuild script.

build/mac/copy_asan_runtime_dylib.sh

 #!/bin/bash
 
 # Copyright (c) 2013 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.
 
 # For app bundles built with ASan, copies the runtime lib
 # (libclang_rt.asan_osx_dynamic.dylib), on which their executables depend, from
 # the compiler installation path into the bundle and fixes the dylib's install
 # name in the binary to be relative to @executable_path.
 
 set -e
 
 BINARY="${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}"
+
+if [[ ! -f "$BINARY" ]]; then
+  # This is neither an .app bundle nor a standalone executable.
+  exit 0
+fi

[Nico, 2013/11/22 01:48:19]

This script is called for non-binaries due to that gyp bug which doesn't allow a
_type check in gyp, right? Explain that here, and maybe add a note that this can
be removed if that gyp bug (maybe 380?) gets fixed.

[Alexander Potapenko, 2013/11/22 09:26:13]

This is because the script is being also called for every _mac_bundle (see
build/common.gypi) including those with '.bundle' extension, which do not
contain executable files.

Recalling a discussion with rsleevi last January I'm now more sceptic about
fixing gyp 380, but will look again.

+
 BINARY_DIR="$(dirname "${BINARY}")"
-ASAN_DYLIB_NAME=libclang_rt.asan_osx_dynamic.dylib
+
+# Find the link to the ASan runtime encoded in the binary.
+BUILTIN_DYLIB_PATH=$(otool -L "${BINARY}" | \
+    sed -Ene 's/^[[:blank:]]+(.*libclang_rt\.asan_.*_dynamic\.dylib).*$/\1/p')
+
+if [[ "${BUILTIN_DYLIB_PATH}" == *asan_iossim_dynamic* ]]; then
+  ASAN_DYLIB_NAME=libclang_rt.asan_iossim_dynamic.dylib
+fi
+if [[ "${BUILTIN_DYLIB_PATH}" == *asan_osx_dynamic* ]]; then

[Nico, 2013/11/22 01:48:19]

elif

[Alexander Potapenko, 2013/11/22 09:26:13]

Done.

+  ASAN_DYLIB_NAME=libclang_rt.asan_osx_dynamic.dylib
+fi
+
+if [[ -z "${BUILTIN_DYLIB_PATH}" ]]; then
+  echo "${BINARY} does not depend on the ASan runtime library!" >&2
+  exit 1
+fi
+
+# TODO(glider): this doesn't work if we set CC and CXX to override the default
+# Clang.
 ASAN_DYLIB=$(find \
     "${BUILT_PRODUCTS_DIR}/../../third_party/llvm-build/Release+Asserts/lib/clang/" \
     -type f -path "*${ASAN_DYLIB_NAME}")
 
-# Find the link to the ASan runtime encoded in the binary.
-BUILTIN_DYLIB_PATH=$(otool -L "${BINARY}" | \
-    sed -Ene 's/^[[:blank:]]+(.*libclang_rt\.asan_osx_dynamic\.dylib).*$/\1/p')
-
-if [[ -z "${BUILTIN_DYLIB_PATH}" ]]; then
-  echo "${BINARY} does not depend on the ASan runtime library!" >&2
-  # TODO(glider): make this return 1 when we fully switch to the dynamic
-  # runtime in ASan.

[Nico, 2013/11/22 01:48:19]

Mention that you fixed this TODO in the cl description too, please.

[Alexander Potapenko, 2013/11/22 09:26:13]

Done.

-  exit 0
-fi
-
 DYLIB_BASENAME=$(basename "${ASAN_DYLIB}")
 if [[ "${DYLIB_BASENAME}" != "${ASAN_DYLIB_NAME}" ]]; then
   echo "basename(${ASAN_DYLIB}) != ${ASAN_DYLIB_NAME}" >&2
   exit 1
 fi
 
 # Check whether the directory containing the executable binary is named
 # "MacOS". In this case we're building a full-fledged OSX app and will put
 # the runtime into appname.app/Contents/Libraries/. Otherwise this is probably
 # an iOS gtest app, and the ASan runtime is put next to the executable.
@@ skipping 12 matching lines @@
 # Make LC_ID_DYLIB of the runtime copy point to its location.
 install_name_tool \
     -id "${NEW_LC_ID_DYLIB}" \
     "${LIBRARIES_DIR}/${ASAN_DYLIB_NAME}"
 
 # Fix the rpath to the runtime library recorded in the binary.
 install_name_tool \
     -change "${BUILTIN_DYLIB_PATH}" \
     "${NEW_LC_ID_DYLIB}" \
     "${BINARY}"