am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm.""

* commit '657eadd4b78b91185ca2042ffb7f92be84e6c1c4':
  Revert "Enable uapi kernel headers for arm."
This commit is contained in:
Christopher Ferris 2013-12-16 10:33:03 -08:00 committed by Android Git Automerger
commit 7f36451b83

View file

@ -203,10 +203,11 @@ ifneq ($(CUSTOM_KERNEL_HEADERS),)
KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS)
else
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
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 \