commit f06535035ef6e48aeacc37819ea7182416275216
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 18 02:23:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 18 02:23:37 2017 +0000
tree 20edfc7e5904f21d454131351c90ca96a5b03188
parent 61073263d41e96d606121cbb3bb0c64b85305898
parent 3fa758f49c42e963985b9b99202c65c217a0bb5b

Merge "Fix Mac build."

libc/include/malloc.h

diff --git a/libc/include/malloc.h b/libc/include/malloc.h
index db5da04..b07a000 100644
--- a/libc/include/malloc.h
+++ b/libc/include/malloc.h
@@ -80,7 +80,7 @@
 /* mallopt options */
 #define M_DECAY_TIME -100
 
-int mallopt(int, int) __INTRODUCED_IN(26);
+int mallopt(int, int) __INTRODUCED_IN_FUTURE;
 
 __END_DECLS
 

tests/run-on-host.sh

diff --git a/tests/run-on-host.sh b/tests/run-on-host.sh
index 1f2cb96..c47bc4f 100755
--- a/tests/run-on-host.sh
+++ b/tests/run-on-host.sh
@@ -8,7 +8,6 @@
         cd ${ANDROID_BUILD_TOP}
         export ANDROID_DATA=${TARGET_OUT_DATA}
         export ANDROID_ROOT=${TARGET_OUT}
-        export LD_LIBRARY_PATH=${HOST_OUT}/obj/lib/
         ${HOST_OUT}/nativetest64/bionic-unit-tests-glibc/bionic-unit-tests-glibc $@
     )
     exit 0