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

Commit 69c36ee7 authored Jan 28, 2014 by Elliott Hughes Committed by Android Git Automerger Jan 28, 2014

am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."

* commit '4fbf23ef':
  Remove libthread_db from the default include path.

parents a8d15474 4fbf23ef

core/combo/TARGET_linux-arm.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -153,7 +153,6 @@ $(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \
	libc_root := bionic/libc		libc_root := bionic/libc
	libm_root := bionic/libm		libm_root := bionic/libm
	libstdc++_root := bionic/libstdc++		libstdc++_root := bionic/libstdc++
	libthread_db_root := bionic/libthread_db


	## on some hosts, the target cross-compiler is not available so do not run this command		## on some hosts, the target cross-compiler is not available so do not run this command
	@@ -207,7 +206,6 @@ $(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \
	$(KERNEL_HEADERS) \		$(KERNEL_HEADERS) \
	$(libm_root)/include \		$(libm_root)/include \
	$(libm_root)/include/arm \		$(libm_root)/include/arm \
	$(libthread_db_root)/include

	$(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_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		$(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 −2

Original line number	Original line	Diff line number	Diff line
	@@ -128,7 +128,6 @@ TARGET_RELEASE_CFLAGS := \
	libc_root := bionic/libc		libc_root := bionic/libc
	libm_root := bionic/libm		libm_root := bionic/libm
	libstdc++_root := bionic/libstdc++		libstdc++_root := bionic/libstdc++
	libthread_db_root := bionic/libthread_db

	TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \		TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
	-print-libgcc-file-name)		-print-libgcc-file-name)
	@@ -144,7 +143,6 @@ TARGET_C_INCLUDES := \
	$(KERNEL_HEADERS) \		$(KERNEL_HEADERS) \
	$(libm_root)/include \		$(libm_root)/include \
	$(libm_root)/include/arm64 \		$(libm_root)/include/arm64 \
	$(libthread_db_root)/include

	TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o		TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
	TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o		TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o

core/combo/TARGET_linux-mips.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -140,7 +140,6 @@ TARGET_RELEASE_CFLAGS := \
	libc_root := bionic/libc		libc_root := bionic/libc
	libm_root := bionic/libm		libm_root := bionic/libm
	libstdc++_root := bionic/libstdc++		libstdc++_root := bionic/libstdc++
	libthread_db_root := bionic/libthread_db


	## on some hosts, the target cross-compiler is not available so do not run this command		## on some hosts, the target cross-compiler is not available so do not run this command
	@@ -198,7 +197,6 @@ TARGET_C_INCLUDES := \
	$(KERNEL_HEADERS) \		$(KERNEL_HEADERS) \
	$(libm_root)/include \		$(libm_root)/include \
	$(libm_root)/include/mips \		$(libm_root)/include/mips \
	$(libthread_db_root)/include

	TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o		TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
	TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o		TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o

core/combo/TARGET_linux-x86.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,6 @@ TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
	libc_root := bionic/libc		libc_root := bionic/libc
	libm_root := bionic/libm		libm_root := bionic/libm
	libstdc++_root := bionic/libstdc++		libstdc++_root := bionic/libstdc++
	libthread_db_root := bionic/libthread_db

	# Define FDO (Feedback Directed Optimization) options.		# Define FDO (Feedback Directed Optimization) options.

	@@ -165,7 +164,6 @@ TARGET_C_INCLUDES := \
	$(KERNEL_HEADERS) \		$(KERNEL_HEADERS) \
	$(libm_root)/include \		$(libm_root)/include \
	$(libm_root)/include/i387 \		$(libm_root)/include/i387 \
	$(libthread_db_root)/include

	TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o		TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
	TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o		TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o

core/combo/TARGET_linux-x86_64.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,6 @@ TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
	libc_root := bionic/libc		libc_root := bionic/libc
	libm_root := bionic/libm		libm_root := bionic/libm
	libstdc++_root := bionic/libstdc++		libstdc++_root := bionic/libstdc++
	libthread_db_root := bionic/libthread_db

	# Define FDO (Feedback Directed Optimization) options.		# Define FDO (Feedback Directed Optimization) options.

	@@ -166,7 +165,6 @@ TARGET_C_INCLUDES := \
	$(KERNEL_HEADERS) \		$(KERNEL_HEADERS) \
	$(libm_root)/include \		$(libm_root)/include \
	$(libm_root)/include/amd64 \		$(libm_root)/include/amd64 \
	$(libthread_db_root)/include

	TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o		TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
	TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o		TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o