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

Commit 617e0fc6 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "libm\'s headers have moved to live with their libc cousins." 

am: fcbd4d8b

* commit 'fcbd4d8b':
  libm's headers have moved to live with their libc cousins.

Change-Id: Ieff5329667f91a72e844d4febfcd1c88505b4d2c
parents 5514b26d fcbd4d8b

core/combo/TARGET_linux-arm.mk

+0 −3
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ $(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \ 
			-frename-registers



libc_root := bionic/libc

libm_root := bionic/libm





## on some hosts, the target cross-compiler is not available so do not run this command
@@ -180,8 +179,6 @@ $(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \ 
	$(libc_root)/arch-arm/include \

	$(libc_root)/include \

	$(KERNEL_HEADERS) \

	$(libm_root)/include \

	$(libm_root)/include/arm \



$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_STATIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o

$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o

core/combo/TARGET_linux-arm64.mk

+0 −3
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ TARGET_RELEASE_CFLAGS := \ 
			-frename-registers



libc_root := bionic/libc

libm_root := bionic/libm



TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \

	-print-libgcc-file-name)
@@ -153,8 +152,6 @@ TARGET_C_INCLUDES := \ 
	$(libc_root)/arch-arm64/include \

	$(libc_root)/include \

	$(KERNEL_HEADERS) \

	$(libm_root)/include \

	$(libm_root)/include/arm64 \



TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o

TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o

core/combo/TARGET_linux-mips.mk

+0 −3
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ $(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \ 
			-frename-registers



libc_root := bionic/libc

libm_root := bionic/libm





## on some hosts, the target cross-compiler is not available so do not run this command
@@ -155,8 +154,6 @@ $(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \ 
	$(libc_root)/arch-mips/include \

	$(libc_root)/include \

	$(KERNEL_HEADERS) \

	$(libm_root)/include \

	$(libm_root)/include/mips \



$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_STATIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o

$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o

core/combo/TARGET_linux-mips64.mk

+0 −5
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ TARGET_RELEASE_CFLAGS := \ 
			-frename-registers



libc_root := bionic/libc

libm_root := bionic/libm





## on some hosts, the target cross-compiler is not available so do not run this command
@@ -162,10 +161,6 @@ TARGET_C_INCLUDES := \ 
	$(libc_root)/arch-mips64/include \

	$(libc_root)/include \

	$(KERNEL_HEADERS) \

	$(libm_root)/include \

	$(libm_root)/include/mips \



# TODO: perhaps use $(libm_root)/include/mips64 instead of mips ?



TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o

TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o

core/combo/TARGET_linux-x86.mk

+0 −3
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ endif 
$(combo_2nd_arch_prefix)TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined



libc_root := bionic/libc

libm_root := bionic/libm



KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi

KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
@@ -135,8 +134,6 @@ $(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \ 
	$(libc_root)/arch-x86/include \

	$(libc_root)/include \

	$(KERNEL_HEADERS) \

	$(libm_root)/include \

	$(libm_root)/include/i387 \



$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_STATIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o

$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o