commit 1a0e850141fe19e1f1d503822893b8d66c0bca69
author Elliott Hughes <enh@google.com> Tue Jan 28 21:29:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 28 21:29:52 2014 +0000
tree e1aa604e561d138e5ed70ed4649018797887dcd8
parent d3737d07c8adb0848dcddb7df03d1e6b4378ab93
parent 1a731adf943bc716cc7b9c95b321db02ad7216db

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

* commit '1a731adf943bc716cc7b9c95b321db02ad7216db':
  Fix KERNEL_HEADERS_ARCH for mips and x86.

core/combo/TARGET_linux-mips.mk

diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index 055a886..637c8f6 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -187,7 +187,7 @@
 
 
 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)
 
 TARGET_C_INCLUDES := \

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 1ed5417..801f882 100755
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -102,7 +102,7 @@
 endif
 
 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)
 
 android_config_h := $(call select-android-config-h,target_linux-x86)