summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib/asan/asan_allocator.h
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-02-28 14:07:01 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-02-28 14:07:01 +0000
commit1cb95a17b830fd1a0510c2f65d2cc018b6888fae (patch)
treef210b91addf33af5414892421369bec37e82670a /compiler-rt/lib/asan/asan_allocator.h
parentbeb8013095e863172d08745e3c3c13b1ee31b4d0 (diff)
downloadbcm5719-llvm-1cb95a17b830fd1a0510c2f65d2cc018b6888fae.tar.gz
bcm5719-llvm-1cb95a17b830fd1a0510c2f65d2cc018b6888fae.zip
[asan] Enable allocator2 on Android.
llvm-svn: 176255
Diffstat (limited to 'compiler-rt/lib/asan/asan_allocator.h')
-rw-r--r--compiler-rt/lib/asan/asan_allocator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/asan_allocator.h b/compiler-rt/lib/asan/asan_allocator.h
index 9ba25424505..9c548232f5f 100644
--- a/compiler-rt/lib/asan/asan_allocator.h
+++ b/compiler-rt/lib/asan/asan_allocator.h
@@ -24,7 +24,7 @@
// will co-exist in the source base for a while. The actual allocator is chosen
// at build time by redefining this macro.
#ifndef ASAN_ALLOCATOR_VERSION
-# if (ASAN_LINUX && !ASAN_ANDROID) || ASAN_MAC || ASAN_WINDOWS
+# if ASAN_LINUX || ASAN_MAC || ASAN_WINDOWS
# define ASAN_ALLOCATOR_VERSION 2
# else
# define ASAN_ALLOCATOR_VERSION 1
OpenPOWER on IntegriCloud