From 2778bfeb5a92b31a15b29568b822f1908a210bcb Mon Sep 17 00:00:00 2001
From: hans <hans@chromium.org>
Date: Tue, 18 Nov 2014 16:55:21 -0800
Subject: [PATCH] Clang update script: update Android NDK flags used when
 building ASan runtime

This is needed after the NDK was rolled, irrespective of Clang version.

BUG=none

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

Cr-Commit-Position: refs/heads/master@{#304720}
---
 tools/clang/scripts/update.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index e576cace7b7d..ad534adb9c50 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -704,7 +704,8 @@ if [[ -n "${with_android}" ]]; then
       --platform=android-14 \
       --install-dir="${LLVM_BUILD_DIR}/android-toolchain" \
       --system=linux-x86_64 \
-      --stl=stlport
+      --stl=stlport \
+      --toolchain=arm-linux-androideabi-4.9
 
   # Android NDK r9d copies a broken unwind.h into the toolchain, see
   # http://crbug.com/357890
-- 
2.11.4.GIT