From 135c5625c74a4e96c73e56fe0dddbba42801d1aa Mon Sep 17 00:00:00 2001
From: Wayne Lin <waynewhlin@google.com>
Date: Sat, 17 Feb 2024 11:08:58 +0800
Subject: [PATCH] gps: maintain one solution

Bug: 315915958
Test: build pass and GPS function works
Change-Id: I3bd3b09edd4e1ca1ecfa578095800c9052db5689
Merged-In: I3bd3b09edd4e1ca1ecfa578095800c9052db5689
---
 factory_tegu.mk                | 4 ----
 location/gnssd/gnss_release.mk | 1 -
 2 files changed, 5 deletions(-)

diff --git a/factory_tegu.mk b/factory_tegu.mk
index 063b388..9df7d95 100644
--- a/factory_tegu.mk
+++ b/factory_tegu.mk
@@ -30,10 +30,6 @@ PRODUCT_MANUFACTURER := Google
 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))
-
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_tg4_wide_hat_tool
 
diff --git a/location/gnssd/gnss_release.mk b/location/gnssd/gnss_release.mk
index 4ce9cde..4ecb181 100644
--- a/location/gnssd/gnss_release.mk
+++ b/location/gnssd/gnss_release.mk
@@ -45,5 +45,4 @@ else
         $(GPS_ROOT)/release/gps_user.cfg:vendor/etc/gnss/gps.cfg
 endif
 
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/lsi/sepolicy