diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-10 16:35:08 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-01-10 16:35:08 -0800 |
| commit | dddb566eba8cd666b6f3b70067e77acb4e1656de (patch) | |
| tree | fdf01ad2dff6cf762eeecece05d184a785e90462 | |
| parent | a26ea82e6a226575f19fec6b5bea111cbe20c233 (diff) | |
| download | build-dddb566eba8cd666b6f3b70067e77acb4e1656de.zip build-dddb566eba8cd666b6f3b70067e77acb4e1656de.tar.gz build-dddb566eba8cd666b6f3b70067e77acb4e1656de.tar.bz2 | |
Remove obsolete CUSTOM_KERNEL_HEADERS.
Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
| -rw-r--r-- | core/combo/TARGET_linux-aarch64.mk | 13 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 13 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 13 | ||||
| -rwxr-xr-x | core/combo/TARGET_linux-x86.mk | 13 | ||||
| -rwxr-xr-x | core/combo/TARGET_linux-x86_64.mk | 13 |
5 files changed, 10 insertions, 55 deletions
diff --git a/core/combo/TARGET_linux-aarch64.mk b/core/combo/TARGET_linux-aarch64.mk index d8a64c5..50996eb 100644 --- a/core/combo/TARGET_linux-aarch64.mk +++ b/core/combo/TARGET_linux-aarch64.mk @@ -133,17 +133,8 @@ libthread_db_root := bionic/libthread_db TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \ -print-libgcc-file-name) -# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use -# symlinks located in out/ to point to the appropriate kernel -# headers. see 'config/kernel_headers.make' for more details -# -ifneq ($(CUSTOM_KERNEL_HEADERS),) - KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS) - KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS) -else - KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi - KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) -endif +KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi +KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) TARGET_C_INCLUDES := \ diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index a946b23..3b95c5c 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -195,17 +195,8 @@ else endif -# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use -# symlinks located in out/ to point to the appropriate kernel -# headers. see 'config/kernel_headers.make' for more details -# -ifneq ($(CUSTOM_KERNEL_HEADERS),) - KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS) - KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS) -else - KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi - KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) -endif +KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi +KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) TARGET_C_INCLUDES := \ diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index a482cc4..e43f7ce 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -186,17 +186,8 @@ else endif -# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use -# symlinks located in out/ to point to the appropriate kernel -# headers. see 'config/kernel_headers.make' for more details -# -ifneq ($(CUSTOM_KERNEL_HEADERS),) - KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS) - KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS) -else - KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi - KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) -endif +KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi +KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) TARGET_C_INCLUDES := \ diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 90f44bd..56c4335 100755 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -102,17 +102,8 @@ else endif endif -# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use -# symlinks located in out/ to point to the appropriate kernel -# headers. see 'config/kernel_headers.make' for more details -# -ifneq ($(CUSTOM_KERNEL_HEADERS),) - KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS) - KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS) -else - KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi - KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) -endif +KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi +KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) android_config_h := $(call select-android-config-h,target_linux-x86) diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 1ad48c8..dd19069 100755 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -104,17 +104,8 @@ else endif endif -# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use -# symlinks located in out/ to point to the appropriate kernel -# headers. see 'config/kernel_headers.make' for more details -# -ifneq ($(CUSTOM_KERNEL_HEADERS),) - KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS) - KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS) -else - KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi - KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64. -endif +KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi +KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64. KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) TARGET_GLOBAL_CFLAGS += \ |