From e7f8bd25f59b17bc86184054876778160c7a1cea Mon Sep 17 00:00:00 2001
From: Cheng Chang <chengcha@google.com>
Date: Tue, 5 Sep 2023 09:21:03 +0000
Subject: [PATCH] gps: build stable factory sdk

Bug: 291186485
Test: verified SDK version by hardware team at b/299463240
Change-Id: I16c4771494fd7d8d7941a970715dad1af7592ed2
---
 factory_comet.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/factory_comet.mk b/factory_comet.mk
index cb78662..aa26da3 100644
--- a/factory_comet.mk
+++ b/factory_comet.mk
@@ -31,8 +31,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
 # Override to factory SDK
-$(call soong_config_set, gpssdk, sdkv1, True)
-$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
+SOONG_CONFIG_NAMESPACES += gpssdk
+SOONG_CONFIG_gpssdk += sdkv1
+override SOONG_CONFIG_gpssdk_sdkv1 := true
+SOONG_CONFIG_NAMESPACES += gpssdk
+SOONG_CONFIG_gpssdk += gpsmcuversion
+override SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT)
 
 # Factory binary of camera
 PRODUCT_PACKAGES += fatp_ct3_wide_hat_tool fatp_ct3_tele_hat_tool fatp_ct3_ultrawide_hat_tool