Merge "Use the cleaner LOCAL_POST_INSTALL_CMD to install symlinks"
diff --git a/conn_init/Android.mk b/conn_init/Android.mk
index 6108f5d..d06823a 100644
--- a/conn_init/Android.mk
+++ b/conn_init/Android.mk
@@ -46,42 +46,12 @@
LOCAL_MODULE := conn_init
LOCAL_MODULE_OWNER := lge
-# Make sure the symlinks get created as well.
-LOCAL_REQUIRED_MODULES := WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin
+# Install symlinks with targets unavailable at build time
+LOCAL_POST_INSTALL_CMD := \
+ mkdir -p $(TARGET_OUT_VENDOR)/firmware/wlan/prima/; \
+ ln -sf /data/misc/wifi/WCNSS_qcom_cfg.ini $(TARGET_OUT_VENDOR)/firmware/wlan/prima/WCNSS_qcom_cfg.ini; \
+ ln -sf /data/misc/wifi/WCNSS_qcom_wlan_nv.bin $(TARGET_OUT_VENDOR)/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin
+
include $(BUILD_EXECUTABLE)
-include $(CLEAR_VARS)
-LOCAL_MODULE := WCNSS_qcom_cfg.ini
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := lge
-include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): TARGET := /data/misc/wifi/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/prima/$(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
-LOCAL_MODULE_OWNER := lge
-include $(BUILD_SYSTEM)/base_rules.mk
-$(LOCAL_BUILT_MODULE): TARGET := /data/misc/wifi/$(LOCAL_MODULE)
-$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/prima/$(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 $@
-
endif
