Revert "Conditionally set dbus group in init rc."
We have dbus group added in commit f7b8cae2ef4fb79473aeede542c9d79a6b5b81c7.
This reverts commit 5029dbb61238eebbd2f94cd946afc2a6bd93bf69.
Change-Id: Ib5c2dfa558c23525a6cfc45726cd3aa9dd6396da
diff --git a/Android.mk b/Android.mk
index 84331cb..6c70e12 100644
--- a/Android.mk
+++ b/Android.mk
@@ -352,12 +352,7 @@
endif # defined(BRILLO)
-ifeq ($(BRILLO_USE_DBUS),1)
-LOCAL_INIT_RC := update_engine-dbus.rc
-else # BRILLO_USE_DBUS != 1
LOCAL_INIT_RC := update_engine.rc
-endif # BRILLO_USE_DBUS == 1
-
include $(BUILD_EXECUTABLE)
ifeq ($(BRILLO_USE_DBUS),1)
diff --git a/update_engine-dbus.rc b/update_engine-dbus.rc
deleted file mode 100644
index 69fc7af..0000000
--- a/update_engine-dbus.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service update_engine /system/bin/update_engine --logtostderr --foreground
- class late_start
- user root
- group root system dbus inet
diff --git a/update_engine.rc b/update_engine.rc
index e62d83c..69fc7af 100644
--- a/update_engine.rc
+++ b/update_engine.rc
@@ -1,4 +1,4 @@
service update_engine /system/bin/update_engine --logtostderr --foreground
class late_start
user root
- group root system inet
+ group root system dbus inet