commit 64cdd0c88618e8cd01870a0d300909e9d28aa170
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 19 22:29:41 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 19 22:29:42 2017 +0000
tree 3573adc3c20c9094a34aa535e7b2c7c8968c0215
parent cdf0b1a44c92575c56ad6f054851c7cb2c78d0b1
parent 5109bb463d3cce67a68875dec3cba9cb0b861ecd

Merge "Make all the ELF relocation constants available."

libc/include/string.h

diff --git a/libc/include/string.h b/libc/include/string.h
index 6520996..c178a3c 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -412,7 +412,7 @@
 #undef __error_zero_size
 #undef __error_if_overflows_dst
 #else // defined(__clang__)
-extern char* __strncpy_real(char* __restrict, const char*, size_t) __RENAME(strcpy);
+extern char* __strncpy_real(char* __restrict, const char*, size_t) __RENAME(strncpy);
 extern void* __memrchr_real(const void*, int, size_t) __RENAME(memrchr);
 extern size_t __strlcpy_real(char* __restrict, const char* __restrict, size_t)
     __RENAME(strlcpy);

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 519c28c..ae8d7fc 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -405,6 +405,7 @@
         "libdl_preempt_test_1",
         "libdl_preempt_test_2",
         "libdl_test_df_1_global",
+        "libgnu-hash-table-library",
         "libsysv-hash-table-library",
         "libtest_atexit",
         "libtest_check_order_dlsym_1_left",
@@ -440,6 +441,7 @@
         "libtest_dlsym_weak_func",
         "libtest_dt_runpath_d",
         "libtest_empty",
+        "libtest_ifunc",
         "libtest_init_fini_order_child",
         "libtest_init_fini_order_grand_child",
         "libtest_init_fini_order_root2",