diff options
| author | Colin Cross <ccross@android.com> | 2016-09-30 04:24:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-30 04:24:28 +0000 |
| commit | edd2bafbb9df6b8afabe88fcd96d9c21838e1117 (patch) | |
| tree | 23938c0536e4dd53e10b951f015f1d6da0b650f5 | |
| parent | d25479d1ed0a18420d9c011fcbdae5e210552e70 (diff) | |
| parent | 0795213c781673a99ceeb63ea7d1d9c73934d3e2 (diff) | |
| download | dbus-edd2bafbb9df6b8afabe88fcd96d9c21838e1117.tar.gz | |
Merge "Update escaping in Android.bp files" am: d655f577be
am: 0795213c78
Change-Id: I57bc0bac3df0b51d810fa204a7ff8b23361545d2
| -rw-r--r-- | bus/Android.bp | 6 | ||||
| -rw-r--r-- | dbus/Android.bp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bus/Android.bp b/bus/Android.bp index 7ab773b6..ee7ba1f0 100644 --- a/bus/Android.bp +++ b/bus/Android.bp @@ -4,9 +4,9 @@ cc_binary { 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 5d12346b..a6e47808 100644 --- a/dbus/Android.bp +++ b/dbus/Android.bp @@ -63,9 +63,9 @@ cc_library_shared { "-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", |