Build libclang_rt.asan-arm-android with stlport and API level 19.

tools/clang/scripts/update.sh

 #!/usr/bin/env bash
 # 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.
 
 # This script will check out llvm and clang into third_party/llvm and build it.
 
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
 CLANG_REVISION=238013
 
 # This is incremented when pushing a new build of Clang at the same revision.
-CLANG_SUB_REVISION=1
+CLANG_SUB_REVISION=2

[hans, 2015/05/28 22:33:53]

I was thinking we could land this without changing the revision to let the ToT
buildbot try it before we roll it in for real.

I'd like to hear what Nico thinks though..

[eugenis, 2015/05/28 22:37:57]

OK, sure, reverted this chunk.

[Nico, 2015/05/29 00:56:21]

Nico is, as often, confused. Wouldn't the ToT buildbot try this with an updated
SUB_REVISION too? It seems strange to me to land this without this bump because
then running package.sh will give you a zip with the same name but different
contents.

 
 PACKAGE_VERSION="${CLANG_REVISION}-${CLANG_SUB_REVISION}"
 
 THIS_DIR="$(dirname "${0}")"
 LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"
 LLVM_BUILD_DIR="${LLVM_DIR}/../llvm-build/Release+Asserts"
 COMPILER_RT_BUILD_DIR="${LLVM_DIR}/../llvm-build/compiler-rt"
 LLVM_BOOTSTRAP_DIR="${LLVM_DIR}/../llvm-bootstrap"
 LLVM_BOOTSTRAP_INSTALL_DIR="${LLVM_DIR}/../llvm-bootstrap-install"
 CLANG_DIR="${LLVM_DIR}/tools/clang"
@@ skipping 646 matching lines @@
   tar -c lib/darwin | tar -C ${ABS_LLVM_CLANG_LIB_DIR} -xv
 else
   tar -c lib/linux | tar -C ${ABS_LLVM_CLANG_LIB_DIR} -xv
 fi
 
 popd
 
 if [[ -n "${with_android}" ]]; then
   # Make a standalone Android toolchain.
   ${ANDROID_NDK_DIR}/build/tools/make-standalone-toolchain.sh \
-      --platform=android-14 \
+      --platform=android-19 \
       --install-dir="${LLVM_BUILD_DIR}/android-toolchain" \
       --system=linux-x86_64 \
-      --stl=libcxx \
+      --stl=stlport \

[hans, 2015/05/28 22:33:53]

Hmm, didn't we just flip this in https://codereview.chromium.org/951983002. I
guess this is the scary part you refer to in the commit message :-)

[eugenis, 2015/05/28 22:37:57]

Exactly. It had no effect until the latest clang roll, and then *boom*
crbug.com/492676.

       --toolchain=arm-linux-androideabi-4.9
 
   # Android NDK r9d copies a broken unwind.h into the toolchain, see
   # http://crbug.com/357890
   rm -v "${LLVM_BUILD_DIR}"/android-toolchain/include/c++/*/unwind.h
 
   # Build ASan runtime for Android in a separate build tree.
   mkdir -p ${LLVM_BUILD_DIR}/android
   pushd ${LLVM_BUILD_DIR}/android
   rm -fv CMakeCache.txt
@@ skipping 19 matching lines @@
   # Run Chrome tool tests.
   ninja -C "${LLVM_BUILD_DIR}" cr-check-all
 fi
 if [[ -n "$run_tests" ]]; then
   # Run the LLVM and Clang tests.
   ninja -C "${LLVM_BUILD_DIR}" check-all
 fi
 
 # After everything is done, log success for this revision.
 echo "${PACKAGE_VERSION}" > "${STAMP_FILE}"