commit 88c6c533e17f7bc2e1491310b8d679a91b33aaeb
author Christopher Ferris <cferris@google.com> Mon Dec 16 09:12:19 2013 -0800
committer Christopher Ferris <cferris@google.com> Mon Dec 16 09:12:19 2013 -0800
tree c653b0c8f371ac9302ef5a146f808cf807175b80
parent 10b1ffaed921bce3014d39ca9dcb705550aa03f0

Enable uapi kernel headers for arm.

Bug: 11559337
Change-Id: Idd251338f707b7c6a08f43a79f9784c57142f43c

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 \