commit 4ffed01fb7d945a584e4cf82fd9fd13cfee07b73
author Dmitriy Ivanov <dimitry@google.com> Thu Jul 31 10:21:00 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Thu Jul 31 11:16:01 2014 -0700
tree a440a33e94e7df215d6ff38302f29bd26c175579
parent a361503e3e68d1b26ce737547c4e1d53a03ec2d9

Exclude bionic private headers from include path

(cherry picked from commit 9516139c03e7e48b2c23a5b53dc4309989e54c6b)

Change-Id: I2883e2a13a523e6938c8a3aed93e66af948cdcd8

libutils/Android.mk

diff --git a/libutils/Android.mk b/libutils/Android.mk
index 4f47d6f..b1dc1f8 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -91,7 +91,7 @@
 LOCAL_CFLAGS += -Werror
 
 LOCAL_C_INCLUDES += \
-		bionic/libc/private \
+		bionic/libc \
 		external/zlib
 
 LOCAL_STATIC_LIBRARIES := \

libutils/Threads.cpp

diff --git a/libutils/Threads.cpp b/libutils/Threads.cpp
index cc7fe89..b09d510 100644
--- a/libutils/Threads.cpp
+++ b/libutils/Threads.cpp
@@ -29,7 +29,7 @@
 # include <sched.h>
 # include <sys/resource.h>
 #ifdef HAVE_ANDROID_OS
-# include <bionic_pthread.h>
+# include <private/bionic_pthread.h>
 #endif
 #elif defined(HAVE_WIN32_THREADS)
 # include <windows.h>