diff --git a/android/Android.mk b/android/Android.mk
index e3c3d500..d3e33ab2 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -47,6 +47,14 @@ LOCAL_SHARED_LIBRARIES += \
 
 include $(BUILD_SHARED_LIBRARY)
 
+BUILD_GNSS_HIDL_SERVICE := true
+ifneq ($(BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET), true)
+ifneq ($(LW_FEATURE_SET),true)
+BUILD_GNSS_HIDL_SERVICE := false
+endif # LW_FEATURE_SET
+endif # BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET
+
+ifeq ($(BUILD_GNSS_HIDL_SERVICE), true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := android.hardware.gnss@1.0-service-qti
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES)
@@ -77,3 +85,4 @@ LOCAL_SHARED_LIBRARIES += \
     android.hardware.gnss@1.0 \
 
 include $(BUILD_EXECUTABLE)
+endif # BUILD_GNSS_HIDL_SERVICE