commit 7aa25cd2ce4d3aac177c1c7401b96d42e30dd8c1
author Colin Cross <ccross@android.com> Fri Sep 30 04:26:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 30 04:26:58 2016 +0000
tree 23938c0536e4dd53e10b951f015f1d6da0b650f5
parent ebaa7c194f20bb4bf209e07437e1fb9b32f9db21
parent edd2bafbb9df6b8afabe88fcd96d9c21838e1117

Merge "Update escaping in Android.bp files" am: d655f577be am: 0795213c78
am: edd2bafbb9

Change-Id: Iaa9da2c51abd844ea0e5baa2769f4e2c8a3762a1

bus/Android.bp

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

dbus/Android.bp

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