diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-07-31 17:44:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-31 17:44:36 +0000 |
| commit | 614b923241420f8d05e6a3a6dd238f0e775b2782 (patch) | |
| tree | 11061bf59527db92721336475178064d5d813873 /libutils | |
| parent | 05004026d9ee89d7fc7873aba0d53e71395ccf34 (diff) | |
| parent | 52b59127d847bef1fd16efe2df578b3079b37918 (diff) | |
| download | system_core-614b923241420f8d05e6a3a6dd238f0e775b2782.zip system_core-614b923241420f8d05e6a3a6dd238f0e775b2782.tar.gz system_core-614b923241420f8d05e6a3a6dd238f0e775b2782.tar.bz2 | |
am 52b59127: am e7ec28bb: Merge "Exclude bionic private headers from include path"
* commit '52b59127d847bef1fd16efe2df578b3079b37918':
Exclude bionic private headers from include path
Diffstat (limited to 'libutils')
| -rw-r--r-- | libutils/Android.mk | 2 | ||||
| -rw-r--r-- | libutils/Threads.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk index dc3668b..856a86c 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -94,7 +94,7 @@ endif LOCAL_CFLAGS += -Werror LOCAL_C_INCLUDES += \ - bionic/libc/private \ + bionic/libc \ external/zlib LOCAL_STATIC_LIBRARIES := \ 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> |