commit d43c8891aea8c23d8b0d997cae23b54ee7540147
author Elliott Hughes <enh@google.com> Fri Sep 30 15:37:48 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 30 15:37:48 2016 +0000
tree 9ac226daeef391f30845e6f6d83ad22a1489ff73
parent 83e9f36a110a41e66bb554f2c4da4c7cc51916ee
parent f48f49932997b0488fe2fc2e3099753f1182ee00

Merge "Fix tests/run-on-host.sh for glibc."

libc/Android.bp

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",
     ],

tests/Android.bp

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",
             ],
         },