Commit 7b29495d authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 6a5f7f58
......@@ -144,13 +144,13 @@ cc_library_static {
// 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",
],
......
......@@ -361,7 +361,7 @@ cc_defaults {
"libutils",
],
ldflags: [
"-Wl,--rpath,\\$${ORIGIN}/../bionic-loader-test-libs",
"-Wl,--rpath,${ORIGIN}/../bionic-loader-test-libs",
"-Wl,--enable-new-dtags",
],
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment