From 36d41d9edc52208aba9b558bab8d2fa0b893ee9f Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Fri, 18 Apr 2014 16:08:46 -0400
Subject: [PATCH] WRAPPER: Fix for previous commit

---
 samples/wrapper/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/samples/wrapper/Makefile b/samples/wrapper/Makefile
index 6ffaf9b885..cce2b5701f 100644
--- a/samples/wrapper/Makefile
+++ b/samples/wrapper/Makefile
@@ -6,12 +6,10 @@ BOINC_API_DIR = $(BOINC_DIR)/api
 BOINC_LIB_DIR = $(BOINC_DIR)/lib
 BOINC_ZIP_DIR = $(BOINC_DIR)/zip
 
-ifeq ($(CXXFLAGS), -DANDROID)
-PTHREAD = 
-endif
-
-ifneq ($(CXXFLAGS), -DANDROID)
+ifneq (, $(findstring ANDROID, $(CXXFLAGS)))
 PTHREAD = -pthread
+else
+PTHREAD = 
 endif
 
 CXXFLAGS += -g -O0 \