Merge "Re-add stpcpy call."
diff --git a/Android.mk b/Android.mk
index 021c026..68a8c43 100644
--- a/Android.mk
+++ b/Android.mk
@@ -184,6 +184,8 @@
LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE_TARGET_ARCH := arm arm64
+
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_EXECUTABLE)
diff --git a/sysdeps/linux-gnu/mips/plt.c b/sysdeps/linux-gnu/mips/plt.c
index 3adf2ec..f0098ac 100644
--- a/sysdeps/linux-gnu/mips/plt.c
+++ b/sysdeps/linux-gnu/mips/plt.c
@@ -22,7 +22,6 @@
*/
#include <string.h>
-#include <error.h>
#include <errno.h>
#include <gelf.h>
#include <sys/ptrace.h>
@@ -210,7 +209,7 @@
if (elf_get_section_type(lte, SHT_DYNAMIC, &scn, &shdr) < 0
|| scn == NULL) {
fail:
- error(0, 0, "Couldn't get SHT_DYNAMIC: %s",
+ fprintf(stderr, "Couldn't get SHT_DYNAMIC: %s",
elf_errmsg(-1));
return -1;
}
@@ -238,7 +237,10 @@
/* Tell the generic code how many dynamic trace:able symbols
* we've got. */
- lte->relplt_count = lte->dynsym_count - lte->arch.mips_gotsym;
+ /* BEGIN android-changed */
+ /* TODO(mkayyash): Investigate a fix for missing relplt_count. */
+ /* lte->relplt_count = lte->dynsym_count - lte->arch.mips_gotsym; */
+ /* END android-changed */
return 0;
}
