| 修訂 | b3e4f06ff6372eca2a0f1ee41d3fb25cb683c117 (tree) |
|---|---|
| 時間 | 2009-07-26 09:48:01 |
| 作者 | Jean-Baptiste Queru <jbq@goog...> |
| Commiter | Jean-Baptiste Queru |
Merge korg/donut into korg/master
Android.mk (diff) android.conf (diff)| @@ -23,13 +23,13 @@ LOCAL_MODULE = showlease | ||
| 23 | 23 | LOCAL_MODULE_TAGS := debug |
| 24 | 24 | include $(BUILD_EXECUTABLE) |
| 25 | 25 | |
| 26 | -include $(CLEAR_VARS) | |
| 27 | -LOCAL_MODULE := dhcpcd.conf | |
| 28 | -LOCAL_MODULE_TAGS := user | |
| 29 | -LOCAL_MODULE_CLASS := ETC | |
| 30 | -LOCAL_MODULE_PATH := $(etc_dir) | |
| 31 | -LOCAL_SRC_FILES := android.conf | |
| 32 | -include $(BUILD_PREBUILT) | |
| 26 | +#include $(CLEAR_VARS) | |
| 27 | +#LOCAL_MODULE := dhcpcd.conf | |
| 28 | +#LOCAL_MODULE_TAGS := user | |
| 29 | +#LOCAL_MODULE_CLASS := ETC | |
| 30 | +#LOCAL_MODULE_PATH := $(etc_dir) | |
| 31 | +#LOCAL_SRC_FILES := android.conf | |
| 32 | +#include $(BUILD_PREBUILT) | |
| 33 | 33 | |
| 34 | 34 | include $(CLEAR_VARS) |
| 35 | 35 | LOCAL_MODULE := dhcpcd-run-hooks |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | # dhcpcd configuration for Android Wi-Fi interface |
| 2 | 2 | # See dhcpcd.conf(5) for details. |
| 3 | 3 | |
| 4 | -interface tiwlan0 | |
| 4 | +interface wlan0 | |
| 5 | 5 | # dhcpcd-run-hooks uses these options. |
| 6 | 6 | option subnet_mask, routers, domain_name_servers |
Android-x86
Fork