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.
This commit is contained in:
Elliott Hughes
2013-12-21 00:03:28 +00:00
committed by Android Git Automerger

View File

@@ -140,13 +140,11 @@ TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
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 \