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

Commit 37c699c2 authored Jan 11, 2014 by Elliott Hughes Committed by Gerrit Code Review Jan 11, 2014

Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."

parents 987616ed dddb566e

core/combo/TARGET_linux-aarch64.mk

+2 −11

Original line number	Diff line number	Diff line
		@@ -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 := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

		TARGET_C_INCLUDES := \

core/combo/TARGET_linux-arm.mk

+2 −11

Original line number	Diff line number	Diff line
		@@ -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 := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

		TARGET_C_INCLUDES := \

core/combo/TARGET_linux-mips.mk

+2 −11

Original line number	Diff line number	Diff line
		@@ -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 := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

		TARGET_C_INCLUDES := \

core/combo/TARGET_linux-x86.mk

+2 −11

Original line number	Diff line number	Diff line
		@@ -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 := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

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

core/combo/TARGET_linux-x86_64.mk

+2 −11

Original line number	Diff line number	Diff line
		@@ -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 := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

		TARGET_GLOBAL_CFLAGS += \