Merge "Fix mbsnrtowcs where `dst` is null."
diff --git a/libc/Android.bp b/libc/Android.bp
index f61cc46..c9b2f93 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -144,13 +144,13 @@
// The name of the tm_gmtoff field in our struct tm.
"-DTM_GMTOFF=tm_gmtoff",
// Where we store our tzdata.
- "-DTZDIR=\\\"/system/usr/share/zoneinfo\\\"",
+ "-DTZDIR=\"/system/usr/share/zoneinfo\"",
// Include `tzname`, `timezone`, and `daylight` globals.
"-DHAVE_POSIX_DECLS=0",
"-DUSG_COMPAT=1",
// Use the empty string (instead of " ") as the timezone abbreviation
// fallback.
- "-DWILDABBR=\\\"\\\"",
+ "-DWILDABBR=\"\"",
"-DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU",
"-Dlint",
],
diff --git a/tests/Android.bp b/tests/Android.bp
index defd76c..4caaa54 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -361,7 +361,7 @@
"libutils",
],
ldflags: [
- "-Wl,--rpath,\\$${ORIGIN}/../bionic-loader-test-libs",
+ "-Wl,--rpath,${ORIGIN}/../bionic-loader-test-libs",
"-Wl,--enable-new-dtags",
],
},
diff --git a/tests/run-on-host.sh b/tests/run-on-host.sh
index c47bc4f..1f2cb96 100755
--- a/tests/run-on-host.sh
+++ b/tests/run-on-host.sh
@@ -8,6 +8,7 @@
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