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

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

am bd36506e: am e57c8446: Merge "Switch x86 to uapi headers." 

* commit 'bd36506e':
  Switch x86 to uapi headers.
parents f817876b bd36506e

core/combo/TARGET_linux-x86.mk

+4 −3
Original line number Diff line number Diff line
@@ -110,10 +110,11 @@ ifneq ($(CUSTOM_KERNEL_HEADERS),) 
    KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)

    KERNEL_HEADERS_ARCH   := $(CUSTOM_KERNEL_HEADERS)

else

    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/common

    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/arch-$(TARGET_ARCH)

    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi

    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)

    KERNEL_HEADERS_AUX    := $(libc_root)/kernel/common

endif

KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) $(KERNEL_HEADERS_AUX)



android_config_h := $(call select-android-config-h,target_linux-x86)