commit 84c6144c52b8d57813ab9ae1d74056ec9d91b44e
author Christopher Ferris <cferris@google.com> Mon Dec 16 18:08:39 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 16 18:08:39 2013 +0000
tree 019a6c590696f97fdec28c2ef18b6cfe52c8fae5
parent dcdd7596235ffe8c69b99efe3f7c70d799f37ffd
parent 675041d128a87378c959fd4b75bfe949a3818947

am 675041d1: am 5e55aabc: am 9c15d111: am 84b99aad: Merge "Enable uapi kernel headers for arm."

* commit '675041d128a87378c959fd4b75bfe949a3818947':
  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 ba440ca..0eb052c 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 \