diff options
| author | Matthew Xie <mattx@google.com> | 2013-04-24 14:21:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-24 14:21:52 -0700 |
| commit | 0db6600a60e8d604aaef5e43db9ae52ed7380979 (patch) | |
| tree | 289d8dde5eea9a81876f18d6134d40760b982632 /rootdir | |
| parent | 82081f71f69bdca08f382e5e212005dbaa301b35 (diff) | |
| parent | 7ee2e26eb98da10eaddf5a8e864d508cceab946b (diff) | |
| download | system_core-0db6600a60e8d604aaef5e43db9ae52ed7380979.zip system_core-0db6600a60e8d604aaef5e43db9ae52ed7380979.tar.gz system_core-0db6600a60e8d604aaef5e43db9ae52ed7380979.tar.bz2 | |
am 7ee2e26e: Remove DBUS from make and header files
* commit '7ee2e26eb98da10eaddf5a8e864d508cceab946b':
Remove DBUS from make and header files
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 1 | ||||
| -rw-r--r-- | rootdir/etc/dbus.conf | 27 |
2 files changed, 0 insertions, 28 deletions
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> |