From c07dc68852832a73c21ed55e02bccd4cd28713f1 Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Tue, 23 Sep 2014 15:42:04 +0000
Subject: [PATCH] [asan] Fix one test on Android-L.

index() is deprecated.

llvm-svn: 218312
---
 compiler-rt/lib/asan/tests/asan_str_test.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler-rt/lib/asan/tests/asan_str_test.cc b/compiler-rt/lib/asan/tests/asan_str_test.cc
index 7872407005c1..1cd2a08b9021 100644
--- a/compiler-rt/lib/asan/tests/asan_str_test.cc
+++ b/compiler-rt/lib/asan/tests/asan_str_test.cc
@@ -221,7 +221,8 @@ UNUSED static void RunStrChrTest(PointerToStrChr2 StrChr) {
 
 TEST(AddressSanitizer, StrChrAndIndexOOBTest) {
   RunStrChrTest(&strchr);
-#if !defined(_WIN32)  // no index() on Windows.
+// No index() on Windows and on Android L.
+#if !defined(_WIN32) && !defined(__ANDROID__)
   RunStrChrTest(&index);
 #endif
 }