diff --git a/.adrastea b/.adrastea
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.adrastea
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.kiwi b/.kiwi
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.kiwi
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.kiwi_v2 b/.kiwi_v2
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.kiwi_v2
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.mango b/.mango
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.mango
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.peach b/.peach
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.peach
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.qca6174 b/.qca6174
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.qca6174
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.qca6390 b/.qca6390
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.qca6390
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.qca6390_cnss2 b/.qca6390_cnss2
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.qca6390_cnss2
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.qca6490 b/.qca6490
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.qca6490
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.qca6490_cnss2 b/.qca6490_cnss2
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.qca6490_cnss2
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.qca6750 b/.qca6750
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.qca6750
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.qcn7605 b/.qcn7605
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.qcn7605
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.wcn6450 b/.wcn6450
deleted file mode 120000
index 6a043149e8..0000000000
--- a/.wcn6450
+++ /dev/null
@@ -1 +0,0 @@
-./
\ No newline at end of file
diff --git a/.wcn6750 b/.wcn6750
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.wcn6750
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/.wlan b/.wlan
deleted file mode 120000
index 945c9b46d6..0000000000
--- a/.wlan
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/Android.mk b/Android.mk
index fd48d01ae1..ed50e372d0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -68,7 +68,13 @@ endif
 endif
 
 ifeq ($(LOCAL_MULTI_KO), true)
+LOCAL_ANDROID_ROOT := $(shell pwd)
+LOCAL_WLAN_BLD_DIR := $(LOCAL_ANDROID_ROOT)/$(WLAN_BLD_DIR)
+$(shell find $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/ -maxdepth 1 \
+	-name '.*' ! -name '.git' -delete {} +)
 
+$(foreach chip, $(TARGET_WLAN_CHIP), \
+	$(shell ln -sf . $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/.$(chip)))
 include $(foreach chip, $(TARGET_WLAN_CHIP), $(LOCAL_PATH)/.$(chip)/Android.mk)
 
 else # Multi-ok check