summaryrefslogtreecommitdiffstats
path: root/core/combo/TARGET_linux-x86.mk
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-01-28 13:07:55 -0800
committerElliott Hughes <enh@google.com>2014-01-28 13:10:19 -0800
commit171e940c7a565e651cf7d0f2edb84d9d92df7f39 (patch)
treea26a3ccd73762d9fcc6c0fee598020dd83bfd1d1 /core/combo/TARGET_linux-x86.mk
parent0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103 (diff)
downloadbuild-171e940c7a565e651cf7d0f2edb84d9d92df7f39.zip
build-171e940c7a565e651cf7d0f2edb84d9d92df7f39.tar.gz
build-171e940c7a565e651cf7d0f2edb84d9d92df7f39.tar.bz2
Fix KERNEL_HEADERS_ARCH for mips and x86.
arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64 use headers that work for both widths. So where arm/arm64 need to handle the second architecture case specially, all we need to do for the others is hard-code the name. (x86_64.mk already hard-codes x86; we need to change x86.mk for the case where we're building the 32-bit binaries for a mixed system. mips64.mk doesn't exist yet, but when it does, it'll hard-code just plain "mips" too.) Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
Diffstat (limited to 'core/combo/TARGET_linux-x86.mk')
-rwxr-xr-xcore/combo/TARGET_linux-x86.mk2
1 files changed, 1 insertions, 1 deletions
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 @@ else
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)