From 6a2f28514c9c72d38af3638adb186c13db28595f Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Wed, 16 Sep 2015 11:09:04 -0700 Subject: [PATCH] Add the common directory back to kernel headers. There will only be a very small set of non-uapi headers. This is mostly being done for the scsi headers since the kernel has not made uapi versions of all of them. Change-Id: I44904b07ff96de918dc5fcab4e5f117a34cb2a87 --- core/combo/TARGET_linux-arm.mk | 1 + core/combo/TARGET_linux-arm64.mk | 1 + core/combo/TARGET_linux-mips.mk | 1 + core/combo/TARGET_linux-mips64.mk | 1 + core/combo/TARGET_linux-x86.mk | 1 + core/combo/TARGET_linux-x86_64.mk | 1 + 6 files changed, 6 insertions(+) diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index f4f30611f..5f0f1d23f 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -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) diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index 88f4d6f23..b213ea735 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -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) diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index 3d215bae3..8e117eb0b 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -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) diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk index 25b9c78c5..565083a6f 100644 --- a/core/combo/TARGET_linux-mips64.mk +++ b/core/combo/TARGET_linux-mips64.mk @@ -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) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 2375d1a32..5fff64136 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -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) diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 0bdfb4600..cacfae1f1 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -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) -- 2.11.0