diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-28 01:04:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 01:04:55 +0000 |
| commit | d63d974c490431f7458eeb49960a2253575e247c (patch) | |
| tree | cfbd6377555dfe26bf9cb8199d55c49c275b7b45 /core | |
| parent | eb18125f2ff1c36540dceb3429b2363bd88dca05 (diff) | |
| parent | 6fe9a94989879babb859a24fdef0b2553955cc53 (diff) | |
| download | build-d63d974c490431f7458eeb49960a2253575e247c.zip build-d63d974c490431f7458eeb49960a2253575e247c.tar.gz build-d63d974c490431f7458eeb49960a2253575e247c.tar.bz2 | |
am 6fe9a949: am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '6fe9a94989879babb859a24fdef0b2553955cc53':
Remove libthread_db from the default include path.
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-arm64.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 2 | ||||
| -rwxr-xr-x | core/combo/TARGET_linux-x86.mk | 2 | ||||
| -rwxr-xr-x | core/combo/TARGET_linux-x86_64.mk | 2 | ||||
| -rw-r--r-- | core/pathmap.mk | 1 |
6 files changed, 0 insertions, 11 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index f0c35b6..7e733d8 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -153,7 +153,6 @@ $(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \ 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 @@ $(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \ $(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 @@ TARGET_RELEASE_CFLAGS := \ 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 @@ TARGET_C_INCLUDES := \ $(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 @@ TARGET_RELEASE_CFLAGS := \ 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 @@ TARGET_C_INCLUDES := \ $(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 @@ TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined 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 @@ TARGET_C_INCLUDES := \ $(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 @@ TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined 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 @@ TARGET_C_INCLUDES := \ $(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 a3911d0..8e441c4 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -42,7 +42,6 @@ pathmap_INCL := \ 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 \ |