diff options
| author | Colin Cross <ccross@android.com> | 2016-09-29 18:31:48 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-09-29 18:31:48 -0700 |
| commit | a14ff920fccb9ed4b820bc936c605f64ffea84dc (patch) | |
| tree | 23938c0536e4dd53e10b951f015f1d6da0b650f5 | |
| parent | 56698ebc6a195704e0d9fe5d1b758dce15798164 (diff) | |
| download | dbus-a14ff920fccb9ed4b820bc936c605f64ffea84dc.tar.gz | |
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
| -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", |