Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 171e940c authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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
parent 0a3cf1a0

core/combo/TARGET_linux-mips.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 := \

core/combo/TARGET_linux-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)