diff --git a/build/core/pathmap.mk b/build/core/pathmap.mk
index b02868e..917bd9b 100644
--- a/build/core/pathmap.mk
+++ b/build/core/pathmap.mk
@@ -7,19 +7,6 @@
 $(eval pathmap_PROJ += $(1):$(2))
 endef
 
-# Enter variant project path into pathmap
-#
-# $(1): name
-# $(2): variable to check
-# $(3): base path
-#
-define project-set-path-variant
-    $(call project-set-path,$(1),$(strip \
-        $(if $($(2)), \
-            $(3)-$($(2)), \
-            $(3))))
-endef
-
 # Returns the path to the requested module's include directory,
 # relative to the root of the source tree.
 #
diff --git a/build/core/qcom_target.mk b/build/core/qcom_target.mk
index 0e43f76..bb9c02e 100644
--- a/build/core/qcom_target.mk
+++ b/build/core/qcom_target.mk
@@ -1,10 +1,3 @@
-define wlan-set-path-variant
-$(call project-set-path-variant,wlan,TARGET_WLAN_VARIANT,hardware/qcom/$(1))
-endef
-define bt-vendor-set-path-variant
-$(call project-set-path-variant,bt-vendor,TARGET_BT_VENDOR_VARIANT,hardware/qcom/$(1))
-endef
-
 # Set device-specific HALs into project pathmap
 define set-device-specific-path
 $(if $(USE_DEVICE_SPECIFIC_$(1)), \
@@ -21,6 +14,7 @@
 $(call set-device-specific-path,DISPLAY,display,hardware/qcom/display-caf/$(QCOM_HARDWARE_VARIANT))
 $(call set-device-specific-path,MEDIA,media,hardware/qcom/media-caf/$(QCOM_HARDWARE_VARIANT))
 
+$(call set-device-specific-path,BT_VENDOR,bt-vendor,hardware/qcom/bt-caf)
 $(call set-device-specific-path,CAMERA,camera,hardware/qcom/camera)
 $(call set-device-specific-path,DATA_IPA_CFG_MGR,data-ipa-cfg-mgr,vendor/qcom/opensource/data-ipa-cfg-mgr)
 $(call set-device-specific-path,GPS,gps,hardware/qcom/gps)
@@ -30,9 +24,7 @@
 $(call set-device-specific-path,POWER,power,hardware/qcom/power)
 $(call set-device-specific-path,THERMAL,thermal,hardware/qcom/thermal)
 $(call set-device-specific-path,VR,vr,hardware/qcom/vr)
-
-$(call wlan-set-path-variant,wlan-caf)
-$(call bt-vendor-set-path-variant,bt-caf)
+$(call set-device-specific-path,WLAN,wlan,hardware/qcom/wlan-caf)
 
 PRODUCT_CFI_INCLUDE_PATHS += \
     hardware/qcom/wlan-caf/qcwcn/wpa_supplicant_8_lib
@@ -42,14 +34,13 @@
 $(call project-set-path,qcom-display,hardware/qcom/display/$(TARGET_BOARD_PLATFORM))
 $(call project-set-path,qcom-media,hardware/qcom/media/$(TARGET_BOARD_PLATFORM))
 
+$(call project-set-path,qcom-bt-vendor,hardware/qcom/bt)
 $(call project-set-path,qcom-camera,hardware/qcom/camera)
 $(call project-set-path,qcom-data-ipa-cfg-mgr,hardware/qcom/data/ipacfg-mgr)
 $(call project-set-path,qcom-gps,hardware/qcom/gps)
 $(call project-set-path,qcom-sensors,hardware/qcom/sensors)
 $(call project-set-path,qcom-loc-api,vendor/qcom/opensource/location)
 $(call project-set-path,qcom-dataservices,$(TARGET_DEVICE_DIR)/dataservices)
-
-$(call wlan-set-path-variant,wlan)
-$(call bt-vendor-set-path-variant,bt)
+$(call project-set-path,qcom-wlan,hardware/qcom/wlan)
 
 endif