[compiler-rt] r200551 - [asan] Fix Android build.

[Evgeniy Stepanov]

Author: eugenis
Date: Fri Jan 31 08:46:37 2014
New Revision: 200551

URL: http://llvm.org/viewvc/llvm-project?rev=200551&view=rev
Log:
[asan] Fix Android build.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=200551&r1=200550&r2=200551&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Fri Jan 31 08:46:37 2014
@@ -340,7 +340,7 @@ namespace __sanitizer {
   unsigned struct_sioc_vif_req_sz = sizeof(struct sioc_vif_req);
 #endif
 
-#if SANITIZER_LINUX
+#if SANITIZER_LINUX && !SANITIZER_ANDROID
   unsigned snd_pcm_sframes_t_sz = sizeof(snd_pcm_sframes_t);
   unsigned snd_pcm_uframes_t_sz = sizeof(snd_pcm_uframes_t);
   unsigned struct_hdsp_9632_aeb_sz = sizeof(struct hdsp_9632_aeb);

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h?rev=200551&r1=200550&r2=200551&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h Fri Jan 31 08:46:37 2014
@@ -591,7 +591,7 @@ namespace __sanitizer {
   extern unsigned struct_sioc_vif_req_sz;
 #endif
 
-#if SANITIZER_LINUX
+#if SANITIZER_LINUX && !SANITIZER_ANDROID
   extern unsigned snd_pcm_sframes_t_sz;
   extern unsigned snd_pcm_uframes_t_sz;
   extern unsigned struct_hdsp_9632_aeb_sz;