From 5f354fda8becbaa51aaee69f35e1d5126edd1085 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <ricardo@cyngn.com>
Date: Sun, 12 Jul 2015 01:32:29 +0100
Subject: [PATCH] wifi: Enable EAP-SIM/AKA

Ref: CRACKLING-357

Change-Id: If2497b79e0c78365d249e2821491bc4747b8d0c7
---
 BoardConfig.mk                                      |  4 ++++
 overlay/packages/apps/Settings/res/values/bools.xml |  5 +++++
 proprietary-files-qc.txt                            |  1 +
 setup-makefiles.sh                                  | 12 ++++++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 overlay/packages/apps/Settings/res/values/bools.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8756b99..eccd1fd 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -61,6 +61,10 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 13295385600
 # Recovery
 TARGET_OTA_ASSERT_DEVICE := crackling,vixen
 
+# Wifi - EAP-SIM
+CONFIG_EAP_PROXY := qmi
+CONFIG_EAP_PROXY_DUAL_SIM := true
+
 TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 
 # SELinux
diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
new file mode 100644
index 0000000..51b7438
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values/bools.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Whether to add SIM/AKA in EAP method for adding network -->
+    <bool name="config_eap_sim_function">true</bool>
+</resources>
diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt
index 0c7ecb6..d68a161 100644
--- a/proprietary-files-qc.txt
+++ b/proprietary-files-qc.txt
@@ -290,4 +290,5 @@ vendor/lib/libTimeService.so
 
 # WLAN
 lib/libwcnss_qmi.so
+-lib64/libwpa_qmi_eap_proxy.so
 lib64/libwcnss_qmi.so
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 116b32a..b0a8805 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -298,6 +298,18 @@ LOCAL_MULTILIB := 64
 LOCAL_PROPRIETARY_MODULE := true
 include \$(BUILD_PREBUILT)
 
+include \$(CLEAR_VARS)
+LOCAL_MODULE := libwpa_qmi_eap_proxy
+LOCAL_MODULE_OWNER := $VENDOR
+LOCAL_SRC_FILES := proprietary/lib64/libwpa_qmi_eap_proxy.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := \$(TARGET_OUT_SHARED_LIBRARIES)
+LOCAL_MULTILIB := 64
+LOCAL_PROPRIETARY_MODULE := true
+include \$(BUILD_PREBUILT)
+
 \$(shell mkdir -p \$(PRODUCT_OUT)/system/vendor/lib/egl && pushd \$(PRODUCT_OUT)/system/vendor/lib > /dev/null && ln -s egl/libEGL_adreno.so libEGL_adreno.so && popd > /dev/null)
 \$(shell mkdir -p \$(PRODUCT_OUT)/system/vendor/lib64/egl && pushd \$(PRODUCT_OUT)/system/vendor/lib64 > /dev/null && ln -s egl/libEGL_adreno.so libEGL_adreno.so && popd > /dev/null)