commit e9890bce2725de10f5b42f14e430878ccf712b69
author Jean-Baptiste Queru <jbq@google.com> Wed Apr 22 17:56:51 2009 -0700
committer Jean-Baptiste Queru <jbq@google.com> Wed Apr 22 17:56:51 2009 -0700
tree b31345015ab1c06d9936e46af90e37ad85518529
parent 9d91cd6aa7641fb38c6d35357d7b037fdf7b77df
parent 8c0fe3157438e38bfbd904229cb71d2fcd22c13c

merge cupcake into donut

Android.mk

diff --git a/Android.mk b/Android.mk
index 1e1aea8..d586825 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,13 +23,13 @@
 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

android.conf

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