commit b5fdb3a94792e8e40b620e2d9119beff70a669e5
author Elliott Hughes <enh@google.com> Mon Nov 25 13:50:26 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 25 13:50:26 2013 -0800
tree ea96a1901b1573a6fbba395cd8f233c6c65896c4
parent 77dcaa93772456b3145a49b067636ef0cccf5ff6
parent 3b54d5a5fc492de5b28d905d0be36be66acec791

am 3b54d5a5: am a5b55c27: Merge "Add a "reverse AUX hack" for ARM."

* commit '3b54d5a5fc492de5b28d905d0be36be66acec791':
  Add a "reverse AUX hack" 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 5fdcce8..ba440ca 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -205,8 +205,9 @@
 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
 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 \