commit 7b29495d0a13794a30e90a65460def2bbb9739a6
author Colin Cross <ccross@android.com> Thu Sep 29 14:08:13 2016 -0700
committer Colin Cross <ccross@android.com> Thu Sep 29 14:37:30 2016 -0700
tree 1789af07752f7d9b6d5b5e73fb3b1f3d256fe4e3
parent 6a5f7f5873cd0f03ec0cea101752c567d744cbfc

Update escaping in Android.bp files

Strings like cflags in Android.bp files are parsed by blueprint,
written to build.ninja files, parsed by ninja, and then passed to
/bin/sh -c.  This had resulted in a combination of blueprint
(\"), ninja ($$), and shell (\$) escaping being necessary.

Soong has been updated to automatically handle ninja and shell
escaping, remove extra escaping from Android.bp files.

Bug: 31221587
Test: m -j
Change-Id: Ib58a51dee8d22296b69ec21768ba6a49dd60e980

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