From 7fe5d802379e0a87abcdaaab90f00ddf20bfecef Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 25 Jun 2024 09:55:13 +0000 Subject: [PATCH] gps: Set configuration by kernel version Bug: 258364350 Test: Verification at b/258364350. Test: Function verification at b/258364350. Test: Compile and verify the configuration is correct. Change-Id: I4dfdc8d65a3a407db3b66aae1a5f05fc0cd226c5 --- device-lynx.mk | 26 ++++++--- location/gps.6.1.xml.l10 | 102 ++++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.l10 | 102 ++++++++++++++++++++++++++++++++++ 3 files changed, 223 insertions(+), 7 deletions(-) create mode 100644 location/gps.6.1.xml.l10 create mode 100644 location/gps_user.6.1.xml.l10 diff --git a/device-lynx.mk b/device-lynx.mk index ba03d52..76b4a20 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -173,17 +173,29 @@ PRODUCT_VENDOR_PROPERTIES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts -# GPS xml +# Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/lynx/location/lhd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/lynx/location/scd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/lynx/location/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/lynx/location/lhd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/lynx/location/scd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/lynx/location/gps.6.1.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/lynx/location/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + PRODUCT_COPY_FILES += \ + device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/lynx/location/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/lynx/location/gps_user.6.1.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/lynx/location/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Wifi HAL diff --git a/location/gps.6.1.xml.l10 b/location/gps.6.1.xml.l10 new file mode 100644 index 0000000..33aa2be --- /dev/null +++ b/location/gps.6.1.xml.l10 @@ -0,0 +1,102 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.l10 b/location/gps_user.6.1.xml.l10 new file mode 100644 index 0000000..833b204 --- /dev/null +++ b/location/gps_user.6.1.xml.l10 @@ -0,0 +1,102 @@ + + + + + + + + + + +