diff options
author | Wayne Lin <waynewhlin@google.com> | 2021-12-03 12:08:02 +0800 |
---|---|---|
committer | Wayne Lin <waynewhlin@google.com> | 2021-12-07 10:14:10 +0000 |
commit | 4cdfc08f1b15cdb295aef167d812ec904e2a0b0c (patch) | |
tree | 32b0d0ad005d265d8a9224875f0b132ac1e49864 /gnss | |
parent | 8cabef33a9d8b118a4b78e4f3b95e98911638705 (diff) | |
download | gs201-4cdfc08f1b15cdb295aef167d812ec904e2a0b0c.tar.gz |
Move gps.xml to device folder
Move gps.xml to device folder and maintain them separately
by project requirement
Bug: 208725716
Test: build pass
Change-Id: I10950cdec6ff77a6a3f9b8ba585960e17c21fe8c
Diffstat (limited to 'gnss')
-rw-r--r-- | gnss/47765/config/gps.xml | 88 | ||||
-rw-r--r-- | gnss/47765/config/gps_user.xml | 87 | ||||
-rw-r--r-- | gnss/device-gnss.mk | 6 |
3 files changed, 2 insertions, 179 deletions
diff --git a/gnss/47765/config/gps.xml b/gnss/47765/config/gps.xml deleted file mode 100644 index 00cc8f4..0000000 --- a/gnss/47765/config/gps.xml +++ /dev/null @@ -1,88 +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 - PortName="/dev/ttyBCM" - BaudRate="921600" - GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby" - CustGpioDelayMs="250" - LogEnabled="true" - Log="JAVA" - SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml" - LogDirectory="/sdcard/gps/broadcom/storage/" - CtrlPipe="/data/vendor/gps/glgpsctrl" - NmeaOutName="/data/vendor/gps/nmea_out" - - acSuplServer="supl.google.com" - SuplPort="7275" - SuplLogEnable="true" - 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="true" - /> - - <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="2" - PowerMode="3" - /> - - <gll_features - EnableNicAutoSwitch="true" - EnableNavic="true" - /> - -</glgps> - diff --git a/gnss/47765/config/gps_user.xml b/gnss/47765/config/gps_user.xml deleted file mode 100644 index f8b182e..0000000 --- a/gnss/47765/config/gps_user.xml +++ /dev/null @@ -1,87 +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 - 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="0" - PowerMode="3" - /> - - <gll_features - EnableNicAutoSwitch="true" - EnableNavic="true" - /> - -</glgps> - diff --git a/gnss/device-gnss.mk b/gnss/device-gnss.mk index 218605b..08afe19 100644 --- a/gnss/device-gnss.mk +++ b/gnss/device-gnss.mk @@ -6,13 +6,11 @@ PRODUCT_COPY_FILES += \ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/gs201/gnss/47765/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/gs201/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \ - device/google/gs201/gnss/47765/config/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/gs201/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf else PRODUCT_COPY_FILES += \ device/google/gs201/gnss/47765/config/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/gs201/gnss/47765/config/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \ - device/google/gs201/gnss/47765/config/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/gs201/gnss/47765/config/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf endif PRODUCT_SOONG_NAMESPACES += \ |