Merge "Remove libthread_db from the default include path."
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index ac2e3aa..f6971c5 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -153,7 +153,6 @@
libc_root := bionic/libc
libm_root := bionic/libm
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
@@ -207,7 +206,6 @@
$(KERNEL_HEADERS) \
$(libm_root)/include \
$(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_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk
index 7819d80..a175eab 100644
--- a/core/combo/TARGET_linux-arm64.mk
+++ b/core/combo/TARGET_linux-arm64.mk
@@ -128,7 +128,6 @@
libc_root := bionic/libc
libm_root := bionic/libm
libstdc++_root := bionic/libstdc++
-libthread_db_root := bionic/libthread_db
TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
-print-libgcc-file-name)
@@ -144,7 +143,6 @@
$(KERNEL_HEADERS) \
$(libm_root)/include \
$(libm_root)/include/arm64 \
- $(libthread_db_root)/include
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index dea8485..055a886 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -140,7 +140,6 @@
libc_root := bionic/libc
libm_root := bionic/libm
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
@@ -198,7 +197,6 @@
$(KERNEL_HEADERS) \
$(libm_root)/include \
$(libm_root)/include/mips \
- $(libthread_db_root)/include
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index dcf8819..1ed5417 100755
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -72,7 +72,6 @@
libc_root := bionic/libc
libm_root := bionic/libm
libstdc++_root := bionic/libstdc++
-libthread_db_root := bionic/libthread_db
# Define FDO (Feedback Directed Optimization) options.
@@ -165,7 +164,6 @@
$(KERNEL_HEADERS) \
$(libm_root)/include \
$(libm_root)/include/i387 \
- $(libthread_db_root)/include
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index 22ba09a..82e25e0 100755
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -74,7 +74,6 @@
libc_root := bionic/libc
libm_root := bionic/libm
libstdc++_root := bionic/libstdc++
-libthread_db_root := bionic/libthread_db
# Define FDO (Feedback Directed Optimization) options.
@@ -166,7 +165,6 @@
$(KERNEL_HEADERS) \
$(libm_root)/include \
$(libm_root)/include/amd64 \
- $(libthread_db_root)/include
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 5dfc543..feecfbf 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -42,7 +42,6 @@
libpagemap:system/extras/libpagemap/include \
libril:hardware/ril/include \
libstdc++:bionic/libstdc++/include \
- libthread_db:bionic/libthread_db/include \
mkbootimg:system/core/mkbootimg \
opengl-tests-includes:frameworks/native/opengl/tests/include \
recovery:bootable/recovery \
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index ac5bac3..d370af9 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -55,7 +55,6 @@
libsurfaceflinger \
libsurfaceflinger_ddmconnection \
libsysutils \
- libthread_db \
libui \
libutils \
linker \