From 813a95df594053d222fd7930e86a8bfb3d89c21d Mon Sep 17 00:00:00 2001
From: Cheng Chang <chengcha@google.com>
Date: Tue, 1 Aug 2023 07:27:50 +0000
Subject: [PATCH] refactor gps build system

Bug: 290725902
Test: verification test at b/290725902
Change-Id: I931b7f655e0994cab81daa01fd40aaad612b343a
---
 device-husky.mk       | 9 +--------
 device-ripcurrent.mk  | 9 +--------
 device-shiba.mk       | 9 +--------
 factory_husky.mk      | 3 +++
 factory_ripcurrent.mk | 3 +++
 factory_shiba.mk      | 3 +++
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/device-husky.mk b/device-husky.mk
index 5da8623..cfd644b 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -244,14 +244,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
 # SDK build system
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Release stable version to factory image
-ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
-	include device/google/gs-common/gps/brcm/device.mk
-else
-	include device/google/gs-common/gps/brcm/device_v2.mk
-endif
-endif
+include device/google/gs-common/gps/brcm/device.mk
 
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 77d5c9b..b74d75e 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -204,14 +204,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
 # SDK build system
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Release stable version to factory image
-ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
-	include device/google/gs-common/gps/brcm/device.mk
-else
-	include device/google/gs-common/gps/brcm/device_v2.mk
-endif
-endif
+include device/google/gs-common/gps/brcm/device.mk
 
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
diff --git a/device-shiba.mk b/device-shiba.mk
index 5507c89..3dd3119 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -234,14 +234,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
 # SDK build system
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Release stable version to factory image
-ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
-	include device/google/gs-common/gps/brcm/device.mk
-else
-	include device/google/gs-common/gps/brcm/device_v2.mk
-endif
-endif
+include device/google/gs-common/gps/brcm/device.mk
 
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
diff --git a/factory_husky.mk b/factory_husky.mk
index 54cbdd7..5c2c0ce 100644
--- a/factory_husky.mk
+++ b/factory_husky.mk
@@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
 $(call inherit-product, device/google/zuma/factory_common.mk)
 $(call inherit-product, device/google/shusky/device-husky.mk)
 include device/google/shusky/audio/husky/factory-audio-tables.mk
+# Override to factory SDK
+$(call soong_config_set, gpssdk, sdkv1, True)
+$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
 
 PRODUCT_NAME := factory_husky
 PRODUCT_DEVICE := husky
diff --git a/factory_ripcurrent.mk b/factory_ripcurrent.mk
index 37d0f63..b7c64c5 100644
--- a/factory_ripcurrent.mk
+++ b/factory_ripcurrent.mk
@@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
 $(call inherit-product, device/google/zuma/factory_common.mk)
 $(call inherit-product, device/google/shusky/device-ripcurrent.mk)
 include device/google/shusky/audio/ripcurrent/factory-audio-tables.mk
+# Override to factory SDK
+$(call soong_config_set, gpssdk, sdkv1, True)
+$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
 
 PRODUCT_NAME := factory_ripcurrent
 PRODUCT_DEVICE := ripcurrent
diff --git a/factory_shiba.mk b/factory_shiba.mk
index 365a2f1..d20f113 100644
--- a/factory_shiba.mk
+++ b/factory_shiba.mk
@@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
 $(call inherit-product, device/google/zuma/factory_common.mk)
 $(call inherit-product, device/google/shusky/device-shiba.mk)
 include device/google/shusky/audio/shiba/factory-audio-tables.mk
+# Override to factory SDK
+$(call soong_config_set, gpssdk, sdkv1, True)
+$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
 
 PRODUCT_NAME := factory_shiba
 PRODUCT_DEVICE := shiba