diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-28 21:23:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-28 21:23:07 +0000 |
| commit | 1a731adf943bc716cc7b9c95b321db02ad7216db (patch) | |
| tree | 28856feaf942d2cd78ac38a941a628f9c07b8328 /core/combo | |
| parent | 49eb440980db6680ec08c48b416e37e937bf9003 (diff) | |
| parent | 171e940c7a565e651cf7d0f2edb84d9d92df7f39 (diff) | |
| download | build-1a731adf943bc716cc7b9c95b321db02ad7216db.zip build-1a731adf943bc716cc7b9c95b321db02ad7216db.tar.gz build-1a731adf943bc716cc7b9c95b321db02ad7216db.tar.bz2 | |
Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 2 | ||||
| -rwxr-xr-x | core/combo/TARGET_linux-x86.mk | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ 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-mips # mips covers both mips and mips64. KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) TARGET_C_INCLUDES := \ 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) |