cedric: Apply wifi symlinks properly

The old way was not working properly, let's use a brand new way.

Change-Id: I50ddd52a170446ad6fe26a7129eedda735cb849e

3 files changed, 50 insertions, 114 deletions

diff --git a/Android.mk b/Android.mk
index 1044a13..95ca0db 100644
--- a/Android.mk
+++ b/Android.mk
@@ -245,6 +245,54 @@ $(FIRMWARE_WIDEVINE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 
 ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_WIDEVINE_SYMLINKS)
 
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := wifi_symlinks
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := FAKE
+LOCAL_MODULE_SUFFIX := -timestamp
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE): ACTUAL_INI_FILE := /system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini
+$(LOCAL_BUILT_MODULE): WCNSS_INI_SYMLINK := $(TARGET_OUT)/etc/wifi/WCNSS_qcom_cfg.ini
+
+$(LOCAL_BUILT_MODULE): ACTUAL_BIN_FILE := /system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin
+$(LOCAL_BUILT_MODULE): WCNSS_BIN_SYMLINK := $(TARGET_OUT)/etc/wifi/WCNSS_qcom_wlan_nv.bin
+
+$(LOCAL_BUILT_MODULE): ACTUAL_BIN_ARG_FILE := /system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv_Argentina.bin
+$(LOCAL_BUILT_MODULE): WCNSS_BIN_ARG_SYMLINK := $(TARGET_OUT)/etc/wifi/WCNSS_qcom_wlan_nv_Argentina.bin
+
+$(LOCAL_BUILT_MODULE): ACTUAL_BIN_BR_FILE := /system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv_Brazil.bin
+$(LOCAL_BUILT_MODULE): WCNSS_BIN_BR_SYMLINK := $(TARGET_OUT)/etc/wifi/WCNSS_qcom_wlan_nv_Brazil.bin
+
+$(LOCAL_BUILT_MODULE): ACTUAL_BIN_IN_FILE := /system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv_India.bin
+$(LOCAL_BUILT_MODULE): WCNSS_BIN_IN_SYMLINK := $(TARGET_OUT)/etc/wifi/WCNSS_qcom_wlan_nv_India.bin
+
+$(LOCAL_BUILT_MODULE): ACTUAL_DAT_FILE := /system/etc/firmware/wlan/prima/WCNSS_wlan_dictionary.dat
+$(LOCAL_BUILT_MODULE): WCNSS_DAT_SYMLINK := $(TARGET_OUT)/etc/wifi/WCNSS_wlan_dictionary.dat
+
+$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/Android.mk
+$(LOCAL_BUILT_MODULE):
+	$(hide) echo "Making symlinks for wifi"
+	$(hide) mkdir -p $(dir $@)
+	$(hide) mkdir -p $(dir $(WCNSS_INI_SYMLINK))
+	$(hide) rm -rf $@
+	$(hide) rm -rf $(WCNSS_INI_SYMLINK)
+	$(hide) ln -sf $(ACTUAL_INI_FILE) $(WCNSS_INI_SYMLINK)
+	$(hide) rm -rf $(WCNSS_BIN_SYMLINK)
+	$(hide) ln -sf $(ACTUAL_BIN_FILE) $(WCNSS_BIN_SYMLINK)
+	$(hide) rm -rf $(WCNSS_BIN_ARG_SYMLINK)
+	$(hide) ln -sf $(ACTUAL_BIN_ARG_FILE) $(WCNSS_BIN_ARG_SYMLINK)
+	$(hide) rm -rf $(WCNSS_BIN_BR_SYMLINK)
+	$(hide) ln -sf $(ACTUAL_BIN_BR_FILE) $(WCNSS_BIN_BR_SYMLINK)
+	$(hide) rm -rf $(WCNSS_BIN_IN_SYMLINK)
+	$(hide) ln -sf $(ACTUAL_BIN_IN_FILE) $(WCNSS_BIN_IN_SYMLINK)
+	$(hide) rm -rf $(WCNSS_DAT_SYMLINK)
+	$(hide) ln -sf $(ACTUAL_DAT_FILE) $(WCNSS_DAT_SYMLINK)
+	$(hide) touch $@
+
+
 include device/motorola/cedric/tftp.mk
 include device/motorola/cedric/expat.mk
 
diff --git a/device.mk b/device.mk
index 38825f3..d5f77a9 100644
--- a/device.mk
+++ b/device.mk
@@ -251,6 +251,7 @@ PRODUCT_COPY_FILES += \
 
 # Wifi
 PRODUCT_PACKAGES += \
+    wifi_symlinks \
     hostapd_default.conf \
     hostapd \
     wpa_supplicant \
@@ -265,22 +266,12 @@ PRODUCT_PACKAGES += \
     tcpdump \
     wcnss_service
 
-# Wifi Symlinks
-PRODUCT_PACKAGES += \
-    WCNSS_qcom_cfg.ini \
-    WCNSS_qcom_wlan_nv.bin \
-    WCNSS_qcom_wlan_nv_Argentina.bin \
-    WCNSS_qcom_wlan_nv_Brazil.bin \
-    WCNSS_qcom_wlan_nv_India.bin \
-    WCNSS_wlan_dictionary.dat
-
 # Wifi Configurations
 PRODUCT_COPY_FILES += \
     kernel/motorola/msm8937/drivers/staging/prima/firmware_bin/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \
     device/motorola/cedric/wifi/WCNSS_qcom_cfg.ini:system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini
 
-
-#ANT+
+# ANT+
 PRODUCT_COPY_FILES += \
     external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:system/etc/permissions/com.dsi.ant.antradio_library.xml
 
diff --git a/wifi/Android.mk b/wifi/Android.mk
index 73a1975..8296060 100644
--- a/wifi/Android.mk
+++ b/wifi/Android.mk
@@ -27,106 +27,3 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := $(LOCAL_MODULE)
 LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)/wifi
 include $(BUILD_PREBUILT)
-
-#----------------------------------------------------------------------
-# Symlinks
-#----------------------------------------------------------------------
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := WCNSS_qcom_cfg.ini
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): TARGET := $(TARGET_OUT)/etc/firmware/wlan/prima/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE): SYMLINK := /system/etc/wifi/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE):
-	$(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) mkdir -p $(dir $(SYMLINK))
-	$(hide) rm -rf $@
-	$(hide) rm -rf $(SYMLINK)
-	$(hide) ln -sf $(TARGET) $(SYMLINK)
-	$(hide) touch $@
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := WCNSS_qcom_wlan_nv.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): TARGET := $(TARGET_OUT)/etc/firmware/wlan/prima/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE): SYMLINK := /system/etc/wifi/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE):
-	$(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) mkdir -p $(dir $(SYMLINK))
-	$(hide) rm -rf $@
-	$(hide) rm -rf $(SYMLINK)
-	$(hide) ln -sf $(TARGET) $(SYMLINK)
-	$(hide) touch $@
-
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := WCNSS_qcom_wlan_nv_Argentina.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): TARGET := $(TARGET_OUT)/etc/firmware/wlan/prima/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE): SYMLINK := /system/etc/wifi/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE):
-	$(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) mkdir -p $(dir $(SYMLINK))
-	$(hide) rm -rf $@
-	$(hide) rm -rf $(SYMLINK)
-	$(hide) ln -sf $(TARGET) $(SYMLINK)
-	$(hide) touch $@
-
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := WCNSS_qcom_wlan_nv_Brazil.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): TARGET := $(TARGET_OUT)/etc/firmware/wlan/prima/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE): SYMLINK := /system/etc/wifi/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE):
-	$(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) mkdir -p $(dir $(SYMLINK))
-	$(hide) rm -rf $@
-	$(hide) rm -rf $(SYMLINK)
-	$(hide) ln -sf $(TARGET) $(SYMLINK)
-	$(hide) touch $@
-
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := WCNSS_qcom_wlan_nv_India.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): TARGET := $(TARGET_OUT)/etc/firmware/wlan/prima/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE): SYMLINK := /system/etc/wifi/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE):
-	$(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) mkdir -p $(dir $(SYMLINK))
-	$(hide) rm -rf $@
-	$(hide) rm -rf $(SYMLINK)
-	$(hide) ln -sf $(TARGET) $(SYMLINK)
-	$(hide) touch $@
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := WCNSS_wlan_dictionary.dat
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): TARGET := $(TARGET_OUT)/etc/firmware/wlan/prima/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE): SYMLINK := /system/etc/wifi/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE):
-	$(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) mkdir -p $(dir $(SYMLINK))
-	$(hide) rm -rf $@
-	$(hide) rm -rf $(SYMLINK)
-	$(hide) ln -sf $(TARGET) $(SYMLINK)
-	$(hide) touch $@