am 693a26ba: am f8c5a6ae: am bd10e2c0: Merge "Switch x86_64 over to uapi headers."

* commit '693a26ba5599b84a3ae2a4b309e22be8a61ba3b0':
  Switch x86_64 over to uapi headers.
This commit is contained in:
Elliott Hughes 2013-11-08 14:56:24 -08:00 committed by Android Git Automerger
commit 06659afcdf

View file

@ -110,8 +110,8 @@ 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_COMMON := $(libc_root)/kernel/uapi
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64.
endif
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)