From a575391d96460ca3795741a2a0ce1081917a5f3b Mon Sep 17 00:00:00 2001
From: Shinru Han <shinruhan@google.com>
Date: Mon, 23 Aug 2021 20:56:19 +0800
Subject: [PATCH] gps: Configuration split

Split configuration for different build variants.

  user:
  gps_user.xml*, lhd_user.conf, scd_user.conf

  userdebug & eng:
  gps.xml.*, lhd.conf, scd.conf

Bug: 197586294
Test: on devices
Change-Id: Icddd6be30dfe2c1eb2dca5f9a61c1b9f43867cc6
---
 gnss/47765/config/gps.xml             |  7 ++-
 gnss/47765/config/gps.xml.oriole      |  7 ++-
 gnss/47765/config/gps.xml.raven       |  7 ++-
 gnss/47765/config/gps2.xml            | 12 ----
 gnss/47765/config/gps_user.xml        | 87 +++++++++++++++++++++++++++
 gnss/47765/config/gps_user.xml.oriole | 87 +++++++++++++++++++++++++++
 gnss/47765/config/gps_user.xml.raven  | 87 +++++++++++++++++++++++++++
 gnss/47765/config/lhd.conf            |  9 +--
 gnss/47765/config/lhd2.conf           |  5 --
 gnss/47765/config/lhd_user.conf       | 31 ++++++++++
 gnss/47765/config/scd.conf            |  4 +-
 gnss/47765/config/scd2.conf           |  2 -
 gnss/47765/config/scd_user.conf       |  5 ++
 gnss/device-gnss.mk                   | 38 ++++++++----
 14 files changed, 341 insertions(+), 47 deletions(-)
 delete mode 100644 gnss/47765/config/gps2.xml
 create mode 100644 gnss/47765/config/gps_user.xml
 create mode 100644 gnss/47765/config/gps_user.xml.oriole
 create mode 100644 gnss/47765/config/gps_user.xml.raven
 delete mode 100644 gnss/47765/config/lhd2.conf
 create mode 100644 gnss/47765/config/lhd_user.conf
 delete mode 100644 gnss/47765/config/scd2.conf
 create mode 100644 gnss/47765/config/scd_user.conf

diff --git a/gnss/47765/config/gps.xml b/gnss/47765/config/gps.xml
index 7bf272de..244b4601 100644
--- a/gnss/47765/config/gps.xml
+++ b/gnss/47765/config/gps.xml
@@ -5,9 +5,9 @@
        BaudRate="921600"
        GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
        CustGpioDelayMs="250"
-       LogEnabled="false"
+       LogEnabled="true"
        Log="JAVA"
-       SecondaryConfigPath="/vendor/etc/gnss/gps2.xml"
+       SecondaryConfigPath="/data/vendor/gps/logs/gps2.xml"
        LogDirectory="/sdcard/gps/broadcom/storage/"
        CtrlPipe="/data/vendor/gps/glgpsctrl"
        NmeaOutName="/data/vendor/gps/nmea_out"
@@ -51,7 +51,7 @@
 
        AttributionAppPkgName="com.google.android.carrierlocation"
 
-       AssertEnabled="false"
+       AssertEnabled="true"
   />
 
   <gll
@@ -75,6 +75,7 @@
        RfPathLossDb_Cp_L5="3.5"
        OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
 
+       EnableOnChipStopNotification="false"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps.xml.oriole b/gnss/47765/config/gps.xml.oriole
index b3819882..4788462c 100644
--- a/gnss/47765/config/gps.xml.oriole
+++ b/gnss/47765/config/gps.xml.oriole
@@ -5,9 +5,9 @@
        BaudRate="921600"
        GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
        CustGpioDelayMs="250"
-       LogEnabled="false"
+       LogEnabled="true"
        Log="JAVA"
-       SecondaryConfigPath="/vendor/etc/gnss/gps2.xml"
+       SecondaryConfigPath="/data/vendor/gps/logs/gps2.xml"
        LogDirectory="/sdcard/gps/broadcom/storage/"
        CtrlPipe="/data/vendor/gps/glgpsctrl"
        NmeaOutName="/data/vendor/gps/nmea_out"
@@ -51,7 +51,7 @@
 
        AttributionAppPkgName="com.google.android.carrierlocation"
 
-       AssertEnabled="false"
+       AssertEnabled="true"
   />
 
   <gll
@@ -75,6 +75,7 @@
        RfPathLossDb_Cp_L5="4.1"
        OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
 
+       EnableOnChipStopNotification="false"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps.xml.raven b/gnss/47765/config/gps.xml.raven
index 4f1a2147..98cdb021 100644
--- a/gnss/47765/config/gps.xml.raven
+++ b/gnss/47765/config/gps.xml.raven
@@ -5,9 +5,9 @@
        BaudRate="921600"
        GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
        CustGpioDelayMs="250"
-       LogEnabled="false"
+       LogEnabled="true"
        Log="JAVA"
-       SecondaryConfigPath="/vendor/etc/gnss/gps2.xml"
+       SecondaryConfigPath="/data/vendor/gps/logs/gps2.xml"
        LogDirectory="/sdcard/gps/broadcom/storage/"
        CtrlPipe="/data/vendor/gps/glgpsctrl"
        NmeaOutName="/data/vendor/gps/nmea_out"
@@ -51,7 +51,7 @@
 
        AttributionAppPkgName="com.google.android.carrierlocation"
 
-       AssertEnabled="false"
+       AssertEnabled="true"
   />
 
   <gll
@@ -75,6 +75,7 @@
        RfPathLossDb_Cp_L5="4"
        OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
 
+       EnableOnChipStopNotification="false"
   />
 
   <gll_features
diff --git a/gnss/47765/config/gps2.xml b/gnss/47765/config/gps2.xml
deleted file mode 100644
index 93fb3edc..00000000
--- a/gnss/47765/config/gps2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       LogEnabled="true"
-       Log="JAVA"
-       AssertEnabled="true"
-  />
-  <gll
-       EnableOnChipStopNotification="false"
-  />
-</glgps>
-
diff --git a/gnss/47765/config/gps_user.xml b/gnss/47765/config/gps_user.xml
new file mode 100644
index 00000000..d731a3c6
--- /dev/null
+++ b/gnss/47765/config/gps_user.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+  />
+
+  <gll
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="13.0"
+       EnableFilteringForLTEB13="true"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="3.5"
+       RfPathLossDb_Cp="3.5"
+       RfPathLossDb_Ap_L5="3.5"
+       RfPathLossDb_Cp_L5="3.5"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="false"
+  />
+
+  <gll_features
+       EnableLowPowerPmm="true"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
diff --git a/gnss/47765/config/gps_user.xml.oriole b/gnss/47765/config/gps_user.xml.oriole
new file mode 100644
index 00000000..cb54e5d9
--- /dev/null
+++ b/gnss/47765/config/gps_user.xml.oriole
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+  />
+
+  <gll
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="9.3"
+       EnableFilteringForLTEB13="true"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="4.2"
+       RfPathLossDb_Cp="4.2"
+       RfPathLossDb_Ap_L5="4.1"
+       RfPathLossDb_Cp_L5="4.1"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="false"
+  />
+
+  <gll_features
+       EnableLowPowerPmm="true"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
diff --git a/gnss/47765/config/gps_user.xml.raven b/gnss/47765/config/gps_user.xml.raven
new file mode 100644
index 00000000..2acc4aad
--- /dev/null
+++ b/gnss/47765/config/gps_user.xml.raven
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplEnable="true"
+       SuplUseApn="true"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+  />
+
+  <gll
+       LogPriMask="LOG_INFO"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="10.6"
+       EnableFilteringForLTEB13="true"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="4.1"
+       RfPathLossDb_Cp="4.1"
+       RfPathLossDb_Ap_L5="4"
+       RfPathLossDb_Cp_L5="4"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="false"
+  />
+
+  <gll_features
+       EnableLowPowerPmm="true"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
diff --git a/gnss/47765/config/lhd.conf b/gnss/47765/config/lhd.conf
index 8b7f1c7a..080b5fd6 100644
--- a/gnss/47765/config/lhd.conf
+++ b/gnss/47765/config/lhd.conf
@@ -5,9 +5,9 @@ GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandb
 
 LhePatch=/vendor/firmware/SensorHub.patch
 Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-# LheConsole=/data/vendor/gps/LheConsole
+LheConsole=/data/vendor/gps/LheConsole
 
-LogEnabled=false
+LogEnabled=true
 Log=JAVA
 LogDirectory=/sdcard/gps/broadcom/storage
 
@@ -17,7 +17,8 @@ LheBbdControl=/dev/bbd_control
 
 # LheBbdSensor=/dev/bbd_sensor
 
-# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
+LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
+LogLevel=*:I
 
 NvStorageDir=/data/vendor/gps/
 
@@ -26,7 +27,7 @@ NvStorageDir=/data/vendor/gps/
 
 LheAutoBaudDelayMS=10
 TrafficLogEnabled=false
-SecondaryConfigPath=/vendor/etc/gnss/lhd2.conf
+SecondaryConfigPath=/data/vendor/gps/logs/lhd2.conf
 
 SkipSensorWakeLock=true
 LoggerWakeLockEnable=false
diff --git a/gnss/47765/config/lhd2.conf b/gnss/47765/config/lhd2.conf
deleted file mode 100644
index b9e638ce..00000000
--- a/gnss/47765/config/lhd2.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LheConsole=/data/vendor/gps/LheConsole
-LogEnabled=true
-Log=JAVA
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
diff --git a/gnss/47765/config/lhd_user.conf b/gnss/47765/config/lhd_user.conf
new file mode 100644
index 00000000..0216ace9
--- /dev/null
+++ b/gnss/47765/config/lhd_user.conf
@@ -0,0 +1,31 @@
+LheName=bbd
+
+LheRsmResetTimeoutMS=10000
+GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
+
+LhePatch=/vendor/firmware/SensorHub.patch
+Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
+# LheConsole=/data/vendor/gps/LheConsole
+
+LogEnabled=false
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+
+LheBbdPacket=/dev/ttyBCM
+
+LheBbdControl=/dev/bbd_control
+
+# LheBbdSensor=/dev/bbd_sensor
+
+# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
+
+NvStorageDir=/data/vendor/gps/
+
+# Enable BBD debugging at these stages:
+# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
+
+LheAutoBaudDelayMS=10
+TrafficLogEnabled=false
+
+SkipSensorWakeLock=true
+LoggerWakeLockEnable=false
diff --git a/gnss/47765/config/scd.conf b/gnss/47765/config/scd.conf
index b7c9b754..ca9ff03d 100644
--- a/gnss/47765/config/scd.conf
+++ b/gnss/47765/config/scd.conf
@@ -1,6 +1,6 @@
-LogEnabled=false
+LogEnabled=true
 Log=JAVA
 LogDirectory=/sdcard/gps/broadcom/storage
 NvStorageDir=/data/vendor/gps/
 TcpConnectionTimeout=20
-SecondaryConfigPath=/vendor/etc/gnss/scd2.conf
+SecondaryConfigPath=/data/vendor/gps/logs/scd2.conf
diff --git a/gnss/47765/config/scd2.conf b/gnss/47765/config/scd2.conf
deleted file mode 100644
index 65e6ffba..00000000
--- a/gnss/47765/config/scd2.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LogEnabled=true
-Log=JAVA
diff --git a/gnss/47765/config/scd_user.conf b/gnss/47765/config/scd_user.conf
new file mode 100644
index 00000000..e75f209b
--- /dev/null
+++ b/gnss/47765/config/scd_user.conf
@@ -0,0 +1,5 @@
+LogEnabled=false
+Log=JAVA
+LogDirectory=/sdcard/gps/broadcom/storage
+NvStorageDir=/data/vendor/gps/
+TcpConnectionTimeout=20
diff --git a/gnss/device-gnss.mk b/gnss/device-gnss.mk
index 18965d75..0ba95fbe 100644
--- a/gnss/device-gnss.mk
+++ b/gnss/device-gnss.mk
@@ -1,24 +1,36 @@
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
-	device/google/gs101/gnss/47765/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-	device/google/gs101/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
 	device/google/gs101/gnss/47765/config/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \
 	device/google/gs101/gnss/47765/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch
 
-ifneq (,$(filter raven, $(TARGET_PRODUCT)))
-PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-else ifneq (,$(filter oriole, $(TARGET_PRODUCT)))
-PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+	PRODUCT_COPY_FILES += \
+		device/google/gs101/gnss/47765/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+		device/google/gs101/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 else
-PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	PRODUCT_COPY_FILES += \
+		device/google/gs101/gnss/47765/config/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+		device/google/gs101/gnss/47765/config/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
 endif
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-# userdebug specific
-PRODUCT_COPY_FILES += \
-	device/google/gs101/gnss/47765/config/lhd2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd2.conf \
-	device/google/gs101/gnss/47765/config/scd2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd2.conf \
-	device/google/gs101/gnss/47765/config/gps2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps2.xml
+ifneq (,$(filter raven, $(subst _, ,$(TARGET_PRODUCT))))
+	ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	else
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	endif
+else ifneq (,$(filter oriole, $(subst _, ,$(TARGET_PRODUCT))))
+	ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	else
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	endif
+else
+	ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	else
+		PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+	endif
 endif
 
 PRODUCT_SOONG_NAMESPACES += \