Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ee2e26e authored by Matthew Xie's avatar Matthew Xie
Browse files

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
parent b3478f4a

include/private/android_filesystem_config.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -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.ril" },

    { 00550, AID_ROOT,      AID_SHELL,     0, "system/etc/init.testmenu" },

    { 00550, AID_ROOT,      AID_SHELL,     0, "system/etc/init.testmenu" },

    { 00550, AID_DHCP,      AID_SHELL,     0, "system/etc/dhcpcd/dhcpcd-run-hooks" },

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

    { 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/ppp/*" },

    { 00555, AID_ROOT,      AID_ROOT,      0, "system/etc/rc.*" },

    { 00555, AID_ROOT,      AID_ROOT,      0, "system/etc/rc.*" },

rootdir/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ include $(CLEAR_VARS) 
# files that live under /system/etc/...

# files that live under /system/etc/...





copy_from := \

copy_from := \

	etc/dbus.conf \

	etc/hosts

	etc/hosts

rootdir/etc/dbus.conf

deleted100644 → 0
+0 −27
Original line number Original line Diff line number Diff line 
<!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>