commit 657eadd4b78b91185ca2042ffb7f92be84e6c1c4
author Christopher Ferris <cferris@google.com> Mon Dec 16 18:28:03 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 16 18:28:03 2013 +0000
tree e6adf66d98f7920fac3a5e281695f2c93f1ccebc
parent 84b99aadddf3cd9d02a60b43923ed11fc7341c9f
parent e2c73b3194891a5fa863a868b9bd7f71e391d0c4

Merge "Revert "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 a946b23..64957bf 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -203,10 +203,11 @@
     KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
     KERNEL_HEADERS_ARCH   := $(CUSTOM_KERNEL_HEADERS)
 else
-    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
-    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
+    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
 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-arm/include \