diff options
| author | Dmitry Shmidt <> | 2009-04-20 09:54:10 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-20 09:54:10 -0700 |
| commit | c41c081366ed687b3b14c202d79da2f9c5bee62d (patch) | |
| tree | b31345015ab1c06d9936e46af90e37ad85518529 | |
| parent | 1d89d71c2e716c7a60c23f34b2d70118d32a22f6 (diff) | |
| parent | 153c3f2e0a47222a58da7a7fe9fb32e405a8373b (diff) | |
| download | external_dhcpcd-c41c081366ed687b3b14c202d79da2f9c5bee62d.zip external_dhcpcd-c41c081366ed687b3b14c202d79da2f9c5bee62d.tar.gz external_dhcpcd-c41c081366ed687b3b14c202d79da2f9c5bee62d.tar.bz2 | |
Merge branch 'readonly-p4-master'
| -rw-r--r-- | Android.mk | 14 | ||||
| -rw-r--r-- | android.conf | 2 |
2 files changed, 8 insertions, 8 deletions
@@ -23,13 +23,13 @@ LOCAL_MODULE = showlease LOCAL_MODULE_TAGS := debug include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) -LOCAL_MODULE := dhcpcd.conf -LOCAL_MODULE_TAGS := user -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(etc_dir) -LOCAL_SRC_FILES := android.conf -include $(BUILD_PREBUILT) +#include $(CLEAR_VARS) +#LOCAL_MODULE := dhcpcd.conf +#LOCAL_MODULE_TAGS := user +#LOCAL_MODULE_CLASS := ETC +#LOCAL_MODULE_PATH := $(etc_dir) +#LOCAL_SRC_FILES := android.conf +#include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := dhcpcd-run-hooks diff --git a/android.conf b/android.conf index 5aa418d..54006c7 100644 --- a/android.conf +++ b/android.conf @@ -1,6 +1,6 @@ # dhcpcd configuration for Android Wi-Fi interface # See dhcpcd.conf(5) for details. -interface tiwlan0 +interface wlan0 # dhcpcd-run-hooks uses these options. option subnet_mask, routers, domain_name_servers |