Merge "goldfish: let usbmanager starts adbd"
diff --git a/init.ranchu.rc b/init.ranchu.rc
index f788494..1c9a252 100644
--- a/init.ranchu.rc
+++ b/init.ranchu.rc
@@ -33,7 +33,6 @@
setprop status.battery.level_raw 50
setprop status.battery.level_scale 9
- start adbd
# set up the GPU caching
setprop ro.hwui.texture_cache_size 72
@@ -48,15 +47,6 @@
setprop ro.hwui.text_large_cache_width 2048
setprop ro.hwui.text_large_cache_height 1024
-# disable some daemons the emulator doesn't want
- stop dund
- stop akmd
-
-# start essential services
-# These were written for the classic emulator, but are applicable to ranchu
- start goldfish-logcat
-# start goldfish-setup
-
# enable Google-specific location features,
# like NetworkLocationProvider and LocationCollector
@@ -65,14 +55,7 @@
#emulator is not much useful before boot complete
#start it later
on property:sys.boot_completed=1
- setprop sys.usb.config adb
- start adbd
- start goldfish-logcat
-
-on property:qemu.adbd=start
- setprop sys.usb.config adb
- start adbd
- start goldfish-logcat
+ start ranchu-net
service ranchu-setup /vendor/bin/init.ranchu-core.sh
class core
