aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-02-22 11:24:20 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-22 11:24:20 -0800
commit1ec2bd91deac8778bea6a821fd65e486ede0e012 (patch)
treee17480420c41bd432fbb3d23ecbbce104782c808
parent4a3d6df5a3c0646a87d6d4495c0885122f23ce53 (diff)
parent26b76bf1a8351477d7bcffa4c2a1b61892782eae (diff)
downloadwpa_supplicant_6-1ec2bd91deac8778bea6a821fd65e486ede0e012.tar.gz
Merge "Move .config for Android to android.config"
-rw-r--r--wpa_supplicant/Android.mk2
-rw-r--r--wpa_supplicant/android.config (renamed from wpa_supplicant/.config)0
2 files changed, 1 insertions, 1 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 669d7f7..5d2bc7c 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -23,7 +23,7 @@ ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),)
CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) = y
endif
-include $(LOCAL_PATH)/.config
+include $(LOCAL_PATH)/android.config
# To force sizeof(enum) = 4
ifeq ($(TARGET_ARCH),arm)
diff --git a/wpa_supplicant/.config b/wpa_supplicant/android.config
index 5a48027..5a48027 100644
--- a/wpa_supplicant/.config
+++ b/wpa_supplicant/android.config