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

Commit b058eeae authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am bc528c22: am f7784e46: am 1a0e8501: am 1a731adf: Merge "Fix... 

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

* commit 'bc528c22':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
parents c5151cf0 bc528c22

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)