diff --git a/hardware/rockchip/gnss/libgps/Android.mk b/hardware/rockchip/gnss/libgps/Android.mk
index f0733ea4fd5..0d110d47efb 100644
--- a/hardware/rockchip/gnss/libgps/Android.mk
+++ b/hardware/rockchip/gnss/libgps/Android.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ifneq ($(BUILD_WITH_EC20),true)
+ifneq ($(ENABLE_QUECTEL_GPS),true)
 
 LOCAL_PATH := $(call my-dir)
 # HAL module implemenation, not prelinked and stored in
diff --git a/vendor/quectel/ec20/BoardConfigPartial.mk b/vendor/quectel/ec20/BoardConfigPartial.mk
index ba589463f5a..37decc26ff2 100644
--- a/vendor/quectel/ec20/BoardConfigPartial.mk
+++ b/vendor/quectel/ec20/BoardConfigPartial.mk
@@ -15,7 +15,10 @@
 #
 
 BUILD_WITH_EC20 ?= false
+ENABLE_QUECTEL_GPS ?= false
 
-BOARD_HAS_GPS := false
+# See vendor/rockchip/common/phone/phone.mk
+ifneq ($(filter true yes, $(BUILD_WITH_EC20)),)
 BOARD_HAVE_DONGLE := false
+endif
 
diff --git a/vendor/quectel/ec20/device-partial.mk b/vendor/quectel/ec20/device-partial.mk
index ed88d554912..d525a2db594 100644
--- a/vendor/quectel/ec20/device-partial.mk
+++ b/vendor/quectel/ec20/device-partial.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-ifeq ($(BUILD_WITH_EC20),true)
+ifneq ($(filter true yes, $(BUILD_WITH_EC20)),)
 
 ENABLE_VENDOR_LIBRIL := true
 
@@ -42,7 +42,7 @@ PRODUCT_VENDOR_PROPERTIES += \
     ro.com.android.dataroaming?=true
 
 
-ifeq ($(BOARD_HAS_GPS),true)
+ifeq ($(ENABLE_QUECTEL_GPS),true)
 
 DEVICE_MANIFEST_FILE += vendor/quectel/ec20/config/gnss.xml
 
diff --git a/vendor/quectel/ec20/libquectel-gps/Android.mk b/vendor/quectel/ec20/libquectel-gps/Android.mk
index c0c291b2f71..dba75aea694 100644
--- a/vendor/quectel/ec20/libquectel-gps/Android.mk
+++ b/vendor/quectel/ec20/libquectel-gps/Android.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-ifeq ($(BUILD_WITH_EC20),true)
+ifeq ($(ENABLE_QUECTEL_GPS),true)
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/vendor/quectel/ec20/libquectel-ril/Android.mk b/vendor/quectel/ec20/libquectel-ril/Android.mk
index ffaa85948c0..31eb048801d 100644
--- a/vendor/quectel/ec20/libquectel-ril/Android.mk
+++ b/vendor/quectel/ec20/libquectel-ril/Android.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-ifeq ($(BUILD_WITH_EC20),true)
+ifneq ($(filter true yes, $(BUILD_WITH_EC20)),)
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/vendor/rockchip/common/phone/phone.mk b/vendor/rockchip/common/phone/phone.mk
index 87db54ff0f3..0433ee8965a 100644
--- a/vendor/rockchip/common/phone/phone.mk
+++ b/vendor/rockchip/common/phone/phone.mk
@@ -16,7 +16,7 @@ PRODUCT_PACKAGES += \
     rild \
     chat
 
-ifneq ($(BUILD_WITH_EC20),true)
+ifeq ($(BUILD_WITH_EC20),false)
 PRODUCT_PACKAGES += \
     usb_dongle \
     usb_modeswitch \