Support Android x86 ASan build.

tools/clang/scripts/update.sh

Index: tools/clang/scripts/update.sh
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 386493753c09de7f3beee2820799d67208db6727..22896ebf31ef99b842174bdfc0b81dcb16b5a565 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -709,6 +709,38 @@ if [[ -n "${with_android}" ]]; then
   # And copy it into the main build tree.
   cp "$(find -name libclang_rt.asan-arm-android.so)" "${ABS_LLVM_CLANG_LIB_DIR}/lib/linux/"
   popd
+
+  # Do the same for x86

[Nico, 2015/07/31 16:56:54]

maybe a for loop over desired archs instead of copypasta?

[Oliver Chang, 2015/07/31 17:46:31]

Done.

+  ${ANDROID_NDK_DIR}/build/tools/make-standalone-toolchain.sh \
+      --platform=android-19 \
+      --install-dir="${LLVM_BUILD_DIR}/android-toolchain-x86" \
+      --system=linux-x86_64 \
+      --stl=stlport \
+      --toolchain=x86-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-x86/include/c++/*/unwind.h
+
+  mkdir -p ${LLVM_BUILD_DIR}/android-x86
+  pushd ${LLVM_BUILD_DIR}/android-x86
+  rm -fv CMakeCache.txt
+  MACOSX_DEPLOYMENT_TARGET=${deployment_target} cmake -GNinja \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DLLVM_ENABLE_ASSERTIONS=ON \
+      -DLLVM_ENABLE_THREADS=OFF \
+      -DCMAKE_C_COMPILER=${PWD}/../bin/clang \
+      -DCMAKE_CXX_COMPILER=${PWD}/../bin/clang++ \
+      -DLLVM_CONFIG_PATH=${PWD}/../bin/llvm-config \
+      -DCMAKE_C_FLAGS="--target=i686-linux-androideabi --sysroot=${PWD}/../android-toolchain-x86/sysroot -B${PWD}/../android-toolchain-x86" \
+      -DCMAKE_CXX_FLAGS="--target=i686-linux-androideabi --sysroot=${PWD}/../android-toolchain-x86/sysroot -B${PWD}/../android-toolchain-x86" \
+      -DANDROID=1 \
+      "${ABS_COMPILER_RT_DIR}"
+  ninja libclang_rt.asan-i686-android.so
+
+  # And copy it into the main build tree.
+  cp "$(find -name libclang_rt.asan-i686-android.so)" "${ABS_LLVM_CLANG_LIB_DIR}/lib/linux/"
+  popd
 fi
 
 if [[ -n "$run_tests" || -n "${LLVM_FORCE_HEAD_REVISION:-''}" ]]; then