commit 894fbbd4272a5075d99a6aa245ca3f6bc2b62989
author Colin Cross <ccross@android.com> Fri Jan 24 17:02:19 2014 -0800
committer Colin Cross <ccross@android.com> Fri Jan 24 17:08:57 2014 -0800
tree 7e4f6397e0c369328a7f1dd4af4a31a8df6cf9ee
parent dcb3334ce57f28a525d7e86222d4c7c6e3907ba3

Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE

64 bit bionic does not define pthread_cond_timeout_np, use
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE to determine whether or
not to use it.

Change-Id: Ia94dd76f7ea4b0268f07049c127342a8bd016ec0

reference-ril/Android.mk

diff --git a/reference-ril/Android.mk b/reference-ril/Android.mk
index 24132aa..f5f771c 100644
--- a/reference-ril/Android.mk
+++ b/reference-ril/Android.mk
@@ -17,7 +17,7 @@
 # for asprinf
 LOCAL_CFLAGS := -D_GNU_SOURCE
 
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS)
+LOCAL_C_INCLUDES :=
 
 ifeq ($(TARGET_DEVICE),sooner)
   LOCAL_CFLAGS += -DUSE_TI_COMMANDS

reference-ril/atchannel.c

diff --git a/reference-ril/atchannel.c b/reference-ril/atchannel.c
index 12ca496..377dfa8 100644
--- a/reference-ril/atchannel.c
+++ b/reference-ril/atchannel.c
@@ -35,9 +35,9 @@
 
 #include "misc.h"
 
-#ifdef HAVE_ANDROID_OS
+#ifdef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE
 #define USE_NP 1
-#endif /* HAVE_ANDROID_OS */
+#endif /* HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE */
 
 
 #define NUM_ELEMS(x) (sizeof(x)/sizeof(x[0]))