diff options
| author | Matthew Xie <mattx@google.com> | 2013-04-23 12:32:49 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2013-04-23 14:02:16 -0700 |
| commit | 7ee2e26eb98da10eaddf5a8e864d508cceab946b (patch) | |
| tree | e6acea5c00e112084888dcaf2045a217a7392911 | |
| parent | b3478f4a50fc44bf573dc4caf4f7e1ddcc4f0eea (diff) | |
| download | system_core-7ee2e26eb98da10eaddf5a8e864d508cceab946b.zip system_core-7ee2e26eb98da10eaddf5a8e864d508cceab946b.tar.gz system_core-7ee2e26eb98da10eaddf5a8e864d508cceab946b.tar.bz2 | |
Remove DBUS from make and header files
DBUS had been needed by bluetooth bluz stack. It is not needed after
we replaced bluez stack with bluedroid stack.
bug 6872904
Change-Id: I3fa41c1dd4ac80bc679d5950b3b20c7f6d12265f
| -rw-r--r-- | include/private/android_filesystem_config.h | 1 | ||||
| -rw-r--r-- | rootdir/Android.mk | 1 | ||||
| -rw-r--r-- | rootdir/etc/dbus.conf | 27 |
3 files changed, 0 insertions, 29 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 540318f..2c9c82b 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -205,7 +205,6 @@ static const struct fs_path_config android_files[] = { { 00550, AID_ROOT, AID_SHELL, 0, "system/etc/init.ril" }, { 00550, AID_ROOT, AID_SHELL, 0, "system/etc/init.testmenu" }, { 00550, AID_DHCP, AID_SHELL, 0, "system/etc/dhcpcd/dhcpcd-run-hooks" }, - { 00440, AID_BLUETOOTH, AID_BLUETOOTH, 0, "system/etc/dbus.conf" }, { 00444, AID_RADIO, AID_AUDIO, 0, "system/etc/AudioPara4.csv" }, { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" }, { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" }, diff --git a/rootdir/Android.mk b/rootdir/Android.mk index e6887bb..3417f54 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -4,7 +4,6 @@ include $(CLEAR_VARS) # files that live under /system/etc/... copy_from := \ - etc/dbus.conf \ etc/hosts diff --git a/rootdir/etc/dbus.conf b/rootdir/etc/dbus.conf deleted file mode 100644 index 75586b9..0000000 --- a/rootdir/etc/dbus.conf +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - - <!-- Our well-known bus type, do not change this --> - <type>system</type> - - <!-- Only allow socket-credentials-based authentication --> - <auth>EXTERNAL</auth> - - <!-- Only listen on a local socket. (abstract=/path/to/socket - means use abstract namespace, don't really create filesystem - file; only Linux supports this. Use path=/whatever on other - systems.) --> - <listen>unix:path=/dev/socket/dbus</listen> - - <!-- Allow everything, D-Bus socket is protected by unix filesystem - permissions --> - <policy context="default"> - <allow send_interface="*"/> - <allow receive_interface="*"/> - <allow own="*"/> - <allow user="*"/> - <allow send_requested_reply="true"/> - <allow receive_requested_reply="true"/> - </policy> -</busconfig> |