summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Imai <imaipi@google.com>2016-03-11 15:17:11 +0900
committerDmitry Shmidt <dimitrysh@google.com>2016-03-16 13:46:06 -0700
commit7b2cbd478e94f28b2fa7e7ff355366dc5146f4f2 (patch)
tree432408b08c1847cf319e5c2aa8b53e560e7d65d8
parent9e954adbc9c889e53932f449fbcd9608ac9c108c (diff)
downloadhikey-7b2cbd478e94f28b2fa7e7ff355366dc5146f4f2.tar.gz
Remove references to deleted dhcpcd
Change-Id: I5e214232d59bdaaa9268735e00bbc9f937bf7d12 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--android_dhcpcd.conf9
-rw-r--r--device.mk1
-rw-r--r--init.hikey.rc14
3 files changed, 0 insertions, 24 deletions
diff --git a/android_dhcpcd.conf b/android_dhcpcd.conf
deleted file mode 100644
index 0fe39969..00000000
--- 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 60eb9637..77c71236 100644
--- a/device.mk
+++ b/device.mk
@@ -84,7 +84,6 @@ PRODUCT_COPY_FILES += \
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 a43adf1c..937cb5c5 100644
--- a/init.hikey.rc
+++ b/init.hikey.rc
@@ -108,17 +108,3 @@ service wpa_supplicant /system/bin/wpa_supplicant \
disabled
oneshot
-service dhcpcd_wlan0 /system/bin/dhcpcd -dABKL
- group dhcp
- disabled
- oneshot
-
-service dhcpcd_eth0 /system/bin/dhcpcd -dABKL
- group dhcp
- disabled
- oneshot
-
-service dhcpcd_bt-pan /system/bin/dhcpcd -dABKL
- group dhcp
- disabled
- oneshot