summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk39
1 files changed, 15 insertions, 24 deletions
diff --git a/Android.mk b/Android.mk
index c26a5c3..021afb5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,30 +20,21 @@ ifneq ($(filter jasmine_sprout jason twolip wayne,$(TARGET_DEVICE)),)
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 := /vendor/etc/wifi/WCNSS_qcom_cfg.ini
-$(LOCAL_BUILT_MODULE): WCNSS_INI_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini
-
-$(LOCAL_BUILT_MODULE): ACTUAL_BIN_FILE := /persist/wlan_mac.bin
-$(LOCAL_BUILT_MODULE): WCNSS_BIN_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/wlan_mac.bin
-
-$(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) touch $@
+WCNSS_INI_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini
+$(WCNSS_INI_SYMLINK): $(LOCAL_INSTALLED_MODULE)
+ @echo "WCNSS config ini link: $@"
+ @mkdir -p $(dir $@)
+ @rm -rf $@
+ $(hide) ln -sf /vendor/etc/wifi/$(notdir $@) $@
+
+WCNSS_MAC_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/wlan_mac.bin
+$(WCNSS_MAC_SYMLINK): $(LOCAL_INSTALLED_MODULE)
+ @echo "WCNSS MAC bin link: $@"
+ @mkdir -p $(dir $@)
+ @rm -rf $@
+ $(hide) ln -sf /mnt/vendor/persist/$(notdir $@) $@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(WCNSS_INI_SYMLINK) $(WCNSS_MAC_SYMLINK)
# A/B builds require us to create the mount points at compile time.
# Just creating it for all cases since it does not hurt.