From 03d80e0623b9e72f52dbbb6ca3ee170e47aa555b Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 12 Apr 2013 21:05:04 -0700 Subject: mako: add supplicant config overlay Change-Id: Ib419f3f361938897e7c307e4e3f1c286d716d84a Signed-off-by: Iliyan Malchev --- Android.mk | 20 ++++++++++++++++++++ device.mk | 4 ++++ p2p_supplicant_overlay.conf | 1 + wpa_supplicant_overlay.conf | 1 + 4 files changed, 26 insertions(+) create mode 100644 p2p_supplicant_overlay.conf create mode 100644 wpa_supplicant_overlay.conf diff --git a/Android.mk b/Android.mk index c952949..4712da3 100644 --- a/Android.mk +++ b/Android.mk @@ -23,6 +23,26 @@ # *not* include it on all devices, so it is safe even with hardware-specific # components. +ifneq ($(filter mako occam,$(TARGET_DEVICE)),) + LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) +LOCAL_MODULE := wpa_supplicant_overlay.conf +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := p2p_supplicant_overlay.conf +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi +include $(BUILD_PREBUILT) + +endif + include $(call first-makefiles-under,$(LOCAL_PATH)) diff --git a/device.mk b/device.mk index 392d71f..931191b 100644 --- a/device.mk +++ b/device.mk @@ -230,6 +230,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ keystore.msm8960 +PRODUCT_PACKAGES += \ + wpa_supplicant_overlay.conf \ + p2p_supplicant_overlay.conf + PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ rild.libpath=/system/lib/libril-qc-qmi-1.so diff --git a/p2p_supplicant_overlay.conf b/p2p_supplicant_overlay.conf new file mode 100644 index 0000000..15200d8 --- /dev/null +++ b/p2p_supplicant_overlay.conf @@ -0,0 +1 @@ +p2p_no_group_iface=1 diff --git a/wpa_supplicant_overlay.conf b/wpa_supplicant_overlay.conf new file mode 100644 index 0000000..15200d8 --- /dev/null +++ b/wpa_supplicant_overlay.conf @@ -0,0 +1 @@ +p2p_no_group_iface=1 -- cgit v1.2.3