Update Android.mk to only support Open Source builds
diff --git a/Android.mk b/Android.mk
index 7fd7dea..a36f0a3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,18 +8,7 @@
# This makefile is only for DLKM
ifneq ($(findstring vendor,$(LOCAL_PATH)),)
-# Determine if we are Proprietary or Open Source
-ifneq ($(findstring opensource,$(LOCAL_PATH)),)
- WLAN_PROPRIETARY := 0
-else
- WLAN_PROPRIETARY := 1
-endif
-
-ifeq ($(WLAN_PROPRIETARY),1)
- WLAN_BLD_DIR := vendor/qcom/proprietary/wlan
-else
- WLAN_BLD_DIR := vendor/qcom/opensource/wlan
-endif
+WLAN_BLD_DIR := vendor/qcom/opensource/wlan
ifeq ($(call is-android-codename,JELLY_BEAN),true)
DLKM_DIR := $(TOP)/device/qcom/common/dlkm
@@ -27,33 +16,6 @@
DLKM_DIR := build/dlkm
endif
-ifeq ($(WLAN_PROPRIETARY),1)
-# For the proprietary driver the firmware files are handled here
-include $(CLEAR_VARS)
-LOCAL_MODULE := WCNSS_qcom_wlan_nv.bin
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/persist
-LOCAL_SRC_FILES := firmware_bin/$(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := WCNSS_cfg.dat
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/wlan/prima
-LOCAL_SRC_FILES := firmware_bin/$(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := WCNSS_qcom_cfg.ini
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/persist
-LOCAL_SRC_FILES := firmware_bin/$(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-endif
# Build prima_wlan.ko
###########################################################
@@ -81,13 +43,6 @@
ln -sf /system/lib/modules/prima/prima_wlan.ko \
$(TARGET_OUT)/lib/modules/wlan.ko)
-ifeq ($(WLAN_PROPRIETARY),1)
-$(shell mkdir -p $(TARGET_OUT_ETC)/firmware/wlan/prima; \
- ln -sf /persist/WCNSS_qcom_wlan_nv.bin \
- $(TARGET_OUT_ETC)/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin; \
- ln -sf /data/misc/wifi/WCNSS_qcom_cfg.ini \
- $(TARGET_OUT_ETC)/firmware/wlan/prima/WCNSS_qcom_cfg.ini)
-endif
endif
endif # 8960 target check