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: I82ef0e976d8c22474e84abd100fb467a425fdff1
diff --git a/bus/Android.bp b/bus/Android.bp
index 7ab773b..ee7ba1f 100644
--- a/bus/Android.bp
+++ b/bus/Android.bp
@@ -4,9 +4,9 @@
cflags: [
"-O3",
"-DDBUS_COMPILATION",
- "-DDBUS_DAEMON_NAME=\\\"dbus-daemon\\\"",
- "-DDBUS_SYSTEM_CONFIG_FILE=\\\"/system/etc/dbus.conf\\\"",
- "-DDBUS_SESSION_CONFIG_FILE=\\\"/system/etc/session.conf\\\"",
+ "-DDBUS_DAEMON_NAME=\"dbus-daemon\"",
+ "-DDBUS_SYSTEM_CONFIG_FILE=\"/system/etc/dbus.conf\"",
+ "-DDBUS_SESSION_CONFIG_FILE=\"/system/etc/session.conf\"",
"-Wno-address",
"-Wno-empty-body",
"-Wno-pointer-sign",
diff --git a/dbus/Android.bp b/dbus/Android.bp
index 5d12346..a6e4780 100644
--- a/dbus/Android.bp
+++ b/dbus/Android.bp
@@ -63,9 +63,9 @@
"-DDBUS_COMPILATION",
"-DANDROID_MANAGED_SOCKET",
"-DHAVE_MONOTONIC_CLOCK",
- "-DDBUS_MACHINE_UUID_FILE=\\\"/etc/machine-id\\\"",
- "-DDBUS_SYSTEM_CONFIG_FILE=\\\"/system/etc/dbus.conf\\\"",
- "-DDBUS_SESSION_CONFIG_FILE=\\\"/system/etc/session.conf\\\"",
+ "-DDBUS_MACHINE_UUID_FILE=\"/etc/machine-id\"",
+ "-DDBUS_SYSTEM_CONFIG_FILE=\"/system/etc/dbus.conf\"",
+ "-DDBUS_SESSION_CONFIG_FILE=\"/system/etc/session.conf\"",
"-Wno-empty-body",
"-Wno-missing-field-initializers",
"-Wno-pointer-sign",
