aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Shmidt <>2009-04-20 09:48:53 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-20 09:48:53 -0700
commit9d91cd6aa7641fb38c6d35357d7b037fdf7b77df (patch)
treeb31345015ab1c06d9936e46af90e37ad85518529
parentb24d85e3a949a108c0f2813a888720af6f2ebc3a (diff)
downloadexternal_dhcpcd-9d91cd6aa7641fb38c6d35357d7b037fdf7b77df.zip
external_dhcpcd-9d91cd6aa7641fb38c6d35357d7b037fdf7b77df.tar.gz
external_dhcpcd-9d91cd6aa7641fb38c6d35357d7b037fdf7b77df.tar.bz2
AI 146934: Make TI Wifi driver choice framework-independent - part 1
BUG=1786365 Automated import of CL 146934
-rw-r--r--Android.mk14
-rw-r--r--android.conf2
2 files changed, 8 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk
index 1e1aea8..d586825 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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