am d2dd0641: am 8ae7aa94: Merge "Remove copy & paste cruft from the mips64 combo."

* commit 'd2dd0641949513a1f76aaf0f6ba0c19d6a8425b2':
  Remove copy & paste cruft from the mips64 combo.
This commit is contained in:
Elliott Hughes 2015-06-16 22:54:32 +00:00 committed by Android Git Automerger
commit 96bd749a8e

View file

@ -137,7 +137,6 @@ TARGET_RELEASE_CFLAGS := \
libc_root := bionic/libc
libm_root := bionic/libm
libthread_db_root := bionic/libthread_db
## on some hosts, the target cross-compiler is not available so do not run this command
@ -168,7 +167,7 @@ TARGET_C_INCLUDES := \
$(KERNEL_HEADERS) \
$(libm_root)/include \
$(libm_root)/include/mips \
$(libthread_db_root)/include
# TODO: perhaps use $(libm_root)/include/mips64 instead of mips ?
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o