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

Commit 2649e750 authored Sep 19, 2015 by Christopher Ferris Committed by Android Git Automerger Sep 19, 2015

am 9bc462c1: Merge "Add the common directory back to kernel headers."

* commit '9bc462c1':
  Add the common directory back to kernel headers.

parents f267f714 9bc462c1

core/combo/TARGET_linux-arm.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@ $(combo_2nd_arch_prefix)TARGET_LIBGCOV := $(shell $($(combo_2nd_arch_prefix)TARG
		endif

		KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
		KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
		KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_$(combo_2nd_arch_prefix)ARCH)
		KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

core/combo/TARGET_linux-arm64.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,7 @@ TARGET_LIBGCOV := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
		-print-file-name=libgcov.a)

		KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
		KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
		KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
		KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

core/combo/TARGET_linux-mips.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,7 @@ $(combo_2nd_arch_prefix)TARGET_LIBGCOV := $(shell $($(combo_2nd_arch_prefix)TARG
		endif

		KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
		KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
		KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-mips # mips covers both mips and mips64.
		KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

core/combo/TARGET_linux-mips64.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@ TARGET_LIBGCOV := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
		endif

		KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
		KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
		KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-mips
		# TODO: perhaps use $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) instead of asm-mips ?
		KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

core/combo/TARGET_linux-x86.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ libc_root := bionic/libc
		libm_root := bionic/libm

		KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
		KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
		KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64.
		KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)