diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-02-22 11:24:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-22 11:24:06 -0800 |
| commit | e5c41fbfc1840bd63ff386e95fb69b084db4e332 (patch) | |
| tree | d9adacdbd7221ec66d483c538c093b014fa19005 /hostapd | |
| parent | 30e144f32477cf3aaf9063b8f63bab9cc31621b7 (diff) | |
| parent | 30f94813e7f35e3812c5d31ebc53630c26c4e4b2 (diff) | |
| download | android_external_wpa_supplicant_8-e5c41fbfc1840bd63ff386e95fb69b084db4e332.tar.gz android_external_wpa_supplicant_8-e5c41fbfc1840bd63ff386e95fb69b084db4e332.tar.bz2 android_external_wpa_supplicant_8-e5c41fbfc1840bd63ff386e95fb69b084db4e332.zip | |
Merge changes If51126b8,I05322cf0
* changes:
wpa_supplicant: Change wpa_supplicant.conf template name
Move .config for Android to android.config
Diffstat (limited to 'hostapd')
| -rw-r--r-- | hostapd/Android.mk | 2 | ||||
| -rw-r--r-- | hostapd/android.config (renamed from hostapd/.config) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index dfff0851..33e69d95 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -8,7 +8,7 @@ endif ifeq ($(WPA_BUILD_HOSTAPD),true) -include $(LOCAL_PATH)/.config +include $(LOCAL_PATH)/android.config # To ignore possible wrong network configurations L_CFLAGS = -DWPA_IGNORE_CONFIG_ERRORS diff --git a/hostapd/.config b/hostapd/android.config index 8341d4b0..8341d4b0 100644 --- a/hostapd/.config +++ b/hostapd/android.config |