am 66153e38: Merge "Switch x86 over to uapi-only."

* commit '66153e38b0fb9525ff6a63eb757b79694b8ad5e2':
  Switch x86 over to uapi-only.
This commit is contained in:
Elliott Hughes 2013-11-26 10:57:07 -08:00 committed by Android Git Automerger
commit 38b14290ea

View file

@ -112,9 +112,8 @@ ifneq ($(CUSTOM_KERNEL_HEADERS),)
else else
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
KERNEL_HEADERS_AUX := $(libc_root)/kernel/common
endif endif
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) $(KERNEL_HEADERS_AUX) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
android_config_h := $(call select-android-config-h,target_linux-x86) android_config_h := $(call select-android-config-h,target_linux-x86)