commit c5f05645ebde67561dc0a1735cc3eb262c37beb9
author Elliott Hughes <enh@google.com> Sat Dec 21 00:03:28 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Dec 21 00:03:28 2013 +0000
tree b654bd955105ea8f2b8173f909cfb2b0bccf31f2
parent 66b4b433012c6c1a9fc9cd07e8210e449bd683cd
parent b986ad2a1c5e758ca1b569305b16d7091f81cf46

am b986ad2a: am 9464ca1b: am b8559790: Merge "Remove a non-existent directory from the include path."

* commit 'b986ad2a1c5e758ca1b569305b16d7091f81cf46':
  Remove a non-existent directory from the include path.

core/combo/TARGET_linux-aarch64.mk

diff --git a/core/combo/TARGET_linux-aarch64.mk b/core/combo/TARGET_linux-aarch64.mk
index d5eba6e..d8a64c5 100644
--- a/core/combo/TARGET_linux-aarch64.mk
+++ b/core/combo/TARGET_linux-aarch64.mk
@@ -140,13 +140,11 @@
 ifneq ($(CUSTOM_KERNEL_HEADERS),)
     KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
     KERNEL_HEADERS_ARCH   := $(CUSTOM_KERNEL_HEADERS)
-    KERNEL_HEADERS_AUX    := $(CUSTOM_KERNEL_HEADERS)
 else
     KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
     KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
-    KERNEL_HEADERS_AUX    := $(libc_root)/kernel/common
 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-aarch64/include \