commit 7bda5aacb1fdb765e2073c00da396bd93db531e5
author Christopher Ferris <cferris@google.com> Tue Dec 17 15:11:58 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 17 15:11:58 2013 -0800
tree 5b34d26007517e060ece9014d44b7a67be48c93d
parent b8a5a597cd33e3ee8dcbc9edfe3908658851547b
parent d12ee620b064d262abce691771fe53ba8987d06f

am d12ee620: Merge "Re-enable uapi kernel headers for arm."

* commit 'd12ee620b064d262abce691771fe53ba8987d06f':
  Re-enable uapi kernel headers for arm.

core/combo/TARGET_linux-arm.mk

diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 64957bf..a946b23 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -203,11 +203,10 @@
     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_AUX    := $(libc_root)/kernel/uapi # for kexec.h
+    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
+    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
 endif
-KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) $(KERNEL_HEADERS_AUX)
+KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
 
 TARGET_C_INCLUDES := \
 	$(libc_root)/arch-arm/include \