am a8a66a4e: am 3356457a: am 9092f8fb: Merge "Use uapi kernel headers."

* commit 'a8a66a4e1972f2abf315ea3e3abe6a9413cf703b':
  Use uapi kernel headers.
This commit is contained in:
Christopher Ferris
2013-12-20 19:18:24 +00:00
committed by Android Git Automerger

View File

@@ -11,9 +11,9 @@
<includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath> <includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath>
<includepath>${ProjDirPath}/bionic/libc/include</includepath> <includepath>${ProjDirPath}/bionic/libc/include</includepath>
<includepath>${ProjDirPath}/bionic/libstdc++/include</includepath> <includepath>${ProjDirPath}/bionic/libstdc++/include</includepath>
<includepath>${ProjDirPath}/bionic/libc/kernel/common</includepath> <includepath>${ProjDirPath}/bionic/libc/kernel/uapi</includepath>
<includepath>${ProjDirPath}/bionic/libc/kernel/common/linux</includepath> <includepath>${ProjDirPath}/bionic/libc/kernel/uapi/linux</includepath>
<includepath>${ProjDirPath}/bionic/libc/kernel/arch-arm</includepath> <includepath>${ProjDirPath}/bionic/libc/kernel/uapi/asm-arm</includepath>
<includepath>${ProjDirPath}/bionic/libm/include</includepath> <includepath>${ProjDirPath}/bionic/libm/include</includepath>
<includepath>${ProjDirPath}/bionic/libm/include/arm</includepath> <includepath>${ProjDirPath}/bionic/libm/include/arm</includepath>
<includepath>${ProjDirPath}/bionic/libthread_db/include</includepath> <includepath>${ProjDirPath}/bionic/libthread_db/include</includepath>
@@ -41,9 +41,9 @@
<includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath> <includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath>
<includepath>${ProjDirPath}/bionic/libc/include</includepath> <includepath>${ProjDirPath}/bionic/libc/include</includepath>
<includepath>${ProjDirPath}/bionic/libstdc++/include</includepath> <includepath>${ProjDirPath}/bionic/libstdc++/include</includepath>
<includepath>${ProjDirPath}/bionic/libc/kernel/common</includepath> <includepath>${ProjDirPath}/bionic/libc/kernel/uapi</includepath>
<includepath>${ProjDirPath}/bionic/libc/kernel/common/linux</includepath> <includepath>${ProjDirPath}/bionic/libc/kernel/uapi/linux</includepath>
<includepath>${ProjDirPath}/bionic/libc/kernel/arch-arm</includepath> <includepath>${ProjDirPath}/bionic/libc/kernel/uapi/asm-arm</includepath>
<includepath>${ProjDirPath}/bionic/libm/include</includepath> <includepath>${ProjDirPath}/bionic/libm/include</includepath>
<includepath>${ProjDirPath}/bionic/libm/include/arm</includepath> <includepath>${ProjDirPath}/bionic/libm/include/arm</includepath>
<includepath>${ProjDirPath}/bionic/libthread_db/include</includepath> <includepath>${ProjDirPath}/bionic/libthread_db/include</includepath>
@@ -71,9 +71,9 @@
<includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath> <includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath>
<includepath>${ProjDirPath}/bionic/libc/include</includepath> <includepath>${ProjDirPath}/bionic/libc/include</includepath>
<includepath>${ProjDirPath}/bionic/libstdc++/include</includepath> <includepath>${ProjDirPath}/bionic/libstdc++/include</includepath>
<includepath>${ProjDirPath}/bionic/libc/kernel/common</includepath> <includepath>${ProjDirPath}/bionic/libc/kernel/uapi</includepath>
<includepath>${ProjDirPath}/bionic/libc/kernel/common/linux</includepath> <includepath>${ProjDirPath}/bionic/libc/kernel/uapi/linux</includepath>
<includepath>${ProjDirPath}/bionic/libc/kernel/arch-arm</includepath> <includepath>${ProjDirPath}/bionic/libc/kernel/uapi/asm-arm</includepath>
<includepath>${ProjDirPath}/bionic/libm/include</includepath> <includepath>${ProjDirPath}/bionic/libm/include</includepath>
<includepath>${ProjDirPath}/bionic/libm/include/arm</includepath> <includepath>${ProjDirPath}/bionic/libm/include/arm</includepath>
<includepath>${ProjDirPath}/bionic/libthread_db/include</includepath> <includepath>${ProjDirPath}/bionic/libthread_db/include</includepath>