am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."

* commit '1a0e850141fe19e1f1d503822893b8d66c0bca69':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
This commit is contained in:
Elliott Hughes 2014-01-28 21:35:25 +00:00 committed by Android Git Automerger
commit f7784e4617
2 changed files with 2 additions and 2 deletions

View file

@ -187,7 +187,7 @@ endif
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-mips # mips covers both mips and mips64.
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
TARGET_C_INCLUDES := \ TARGET_C_INCLUDES := \

View file

@ -102,7 +102,7 @@ else
endif endif
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-x86 # x86 covers both x86 and x86_64.
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) 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)