am 7bda5aac: am d12ee620: Merge "Re-enable uapi kernel headers for arm."

* commit '7bda5aacb1fdb765e2073c00da396bd93db531e5':
  Re-enable uapi kernel headers for arm.
This commit is contained in:
Christopher Ferris 2013-12-17 23:15:55 +00:00 committed by Android Git Automerger
commit 5fb7c74aeb

View file

@ -203,11 +203,10 @@ ifneq ($(CUSTOM_KERNEL_HEADERS),)
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 \