From eaeec923035b0bc7dffc11b5696163856c20e57b Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 25 Jun 2024 09:48:18 +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: I0e5426dadc03e8f1681fc8b99aa2abd7bf0b6d27 --- device-felix.mk | 16 ++++- location/gps.6.1.xml.f10 | 106 ++++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.f10 | 105 +++++++++++++++++++++++++++++++++ 3 files changed, 225 insertions(+), 2 deletions(-) create mode 100644 location/gps.6.1.xml.f10 create mode 100644 location/gps_user.6.1.xml.f10 diff --git a/device-felix.mk b/device-felix.mk index cc75c91..4637a7b 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -279,14 +279,26 @@ PRODUCT_COPY_FILES += \ # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - device/google/felix/location/gps.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ device/google/felix/location/lhd.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ device/google/felix/location/scd.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/felix/location/gps.6.1.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/felix/location/gps.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else PRODUCT_COPY_FILES += \ - device/google/felix/location/gps_user.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ device/google/felix/location/lhd_user.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ device/google/felix/location/scd_user.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/felix/location/gps_user.6.1.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/felix/location/gps_user.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif PRODUCT_PACKAGES += \ diff --git a/location/gps.6.1.xml.f10 b/location/gps.6.1.xml.f10 new file mode 100644 index 0000000..fbf2d67 --- /dev/null +++ b/location/gps.6.1.xml.f10 @@ -0,0 +1,106 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.f10 b/location/gps_user.6.1.xml.f10 new file mode 100644 index 0000000..e4f32da --- /dev/null +++ b/location/gps_user.6.1.xml.f10 @@ -0,0 +1,105 @@ + + + + + + + + + +