commit e0daed20a6dfbd767ece790a30f68e602a0ec1ad
author Elliott Hughes <enh@google.com> Thu Nov 21 17:07:48 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 21 17:07:48 2013 -0800
tree 36c29ce974d5d7b6d58cb9efcc0bb7b5ba891f43
parent a4a1061fbf5e59319510528a7eda77fe8f6fbd09
parent a59b8545cf1aa013cf87b9946e738e0add1f4536

am a59b8545: am e296f2c3: Merge "Switch mips to the uapi kernel headers."

* commit 'a59b8545cf1aa013cf87b9946e738e0add1f4536':
  Switch mips to the uapi kernel headers.

core/combo/TARGET_linux-mips.mk

diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index 0d09802..99ea022 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -194,10 +194,11 @@
     KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
     KERNEL_HEADERS_ARCH   := $(CUSTOM_KERNEL_HEADERS)
 else
-    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/common
-    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/arch-$(TARGET_ARCH)
+    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
+    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
+    KERNEL_HEADERS_AUX    := $(libc_root)/kernel/common
 endif
-KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
+KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) $(KERNEL_HEADERS_AUX)
 
 TARGET_C_INCLUDES := \
 	$(libc_root)/arch-mips/include \