hikey: Remove dhcpcd references am: a061974248
am: 6922e13d5f
Change-Id: I27297bc91210e9dae6090f2070ce9b1476e30bf9
diff --git a/android_dhcpcd.conf b/android_dhcpcd.conf
deleted file mode 100644
index 0fe3996..0000000
--- a/android_dhcpcd.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# dhcpcd configuration for Android Wi-Fi interface
-# See dhcpcd.conf(5) for details.
-
-# Disable solicitation of IPv6 Router Advertisements
-noipv6rs
-
-interface wlan0
-# dhcpcd-run-hooks uses these options.
-option subnet_mask, routers, domain_name_servers, interface_mtu
diff --git a/device.mk b/device.mk
index 7c9aa8f..e63f337 100644
--- a/device.mk
+++ b/device.mk
@@ -98,7 +98,6 @@
frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
- device/linaro/hikey/android_dhcpcd.conf:system/etc/dhcpcd/dhcpcd.conf \
device/linaro/hikey/audio/audio_policy.conf:system/etc/audio_policy.conf
# Copy media codecs config file
diff --git a/init.hikey.rc b/init.hikey.rc
index 5b53d6e..59f56bd 100644
--- a/init.hikey.rc
+++ b/init.hikey.rc
@@ -102,28 +102,3 @@
class main
disabled
oneshot
-
-service dhcpcd_wlan0 /system/bin/dhcpcd -dABKL -f /system/etc/dhcpcd/dhcpcd.conf wlan0
- group dhcp
- disabled
- oneshot
-
-service dhcpcd_eth0 /system/bin/dhcpcd -dABKL -f /system/etc/dhcpcd/dhcpcd.conf eth0
- group dhcp
- disabled
- oneshot
-
-service dhcpcd_usb0 /system/bin/dhcpcd -dABKL -f /system/etc/dhcpcd/dhcpcd.conf usb0
- group dhcp
- disabled
- oneshot
-
-service iprenew_usb0 /system/bin/dhcpcd -n usb0
- class main
- disabled
- oneshot
-
-service dhcpcd_bt-pan /system/bin/dhcpcd -dABKL -f /system/etc/dhcpcd/dhcpcd.conf bt-pan0
- group dhcp
- disabled
- oneshot