From 1ef44c0cd3eaa13fdc11173b3e67888f3adb11e2 Mon Sep 17 00:00:00 2001
From: Francis Ma <fma@fb.com>
Date: Fri, 5 Feb 2016 14:42:28 -0800
Subject: [PATCH] Make folly/future portable on android

Summary: Some small changes to port folly/futures onto android

Reviewed By: mzlee

Differential Revision: D2787564

fb-gh-sync-id: 8c161942c24c2b7b0484339eaa51c5a356f17de5
---
 folly/detail/CacheLocality.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/folly/detail/CacheLocality.cpp b/folly/detail/CacheLocality.cpp
index f9e4609f..ff3937c2 100644
--- a/folly/detail/CacheLocality.cpp
+++ b/folly/detail/CacheLocality.cpp
@@ -206,7 +206,7 @@ CacheLocality CacheLocality::uniform(size_t numCpus) {
 /// Resolves the dynamically loaded symbol __vdso_getcpu, returning null
 /// on failure
 static Getcpu::Func loadVdsoGetcpu() {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BIONIC__)
   return nullptr;
 #else
   void* h = dlopen("linux-vdso.so.1", RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD);
-- 
2.34.1