From 6b32b0b465c0c29cd1aa76451b2a6331acfea0f9 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 25 Jun 2024 05:24:39 +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: I0d108ee41c8aeb794777b9d3c0e39b8ed5610ec7 --- device-cheetah.mk | 24 ++++++-- device-panther.mk | 24 ++++++-- location/gps.6.1.xml.c10 | 106 ++++++++++++++++++++++++++++++++++ location/gps.6.1.xml.p10 | 106 ++++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.c10 | 105 +++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.p10 | 105 +++++++++++++++++++++++++++++++++ 6 files changed, 458 insertions(+), 12 deletions(-) create mode 100644 location/gps.6.1.xml.c10 create mode 100644 location/gps.6.1.xml.p10 create mode 100644 location/gps_user.6.1.xml.c10 create mode 100644 location/gps_user.6.1.xml.p10 diff --git a/device-cheetah.mk b/device-cheetah.mk index 49a3845..e110a54 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -302,15 +302,27 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/pantah/location/scd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/pantah/location/gps.6.1.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/lhd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/pantah/location/lhd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/pantah/location/scd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/pantah/location/gps_user.6.1.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Set support one-handed mode diff --git a/device-panther.mk b/device-panther.mk index 0990bbd..f64ee08 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -285,15 +285,27 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/pantah/location/gps.6.1.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/pantah/location/gps_user.6.1.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Set support one-handed mode diff --git a/location/gps.6.1.xml.c10 b/location/gps.6.1.xml.c10 new file mode 100644 index 0000000..ddc4e95 --- /dev/null +++ b/location/gps.6.1.xml.c10 @@ -0,0 +1,106 @@ + + + + + + + + + + diff --git a/location/gps.6.1.xml.p10 b/location/gps.6.1.xml.p10 new file mode 100644 index 0000000..46e0406 --- /dev/null +++ b/location/gps.6.1.xml.p10 @@ -0,0 +1,106 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.c10 b/location/gps_user.6.1.xml.c10 new file mode 100644 index 0000000..f00c918 --- /dev/null +++ b/location/gps_user.6.1.xml.c10 @@ -0,0 +1,105 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.p10 b/location/gps_user.6.1.xml.p10 new file mode 100644 index 0000000..6f71d32 --- /dev/null +++ b/location/gps_user.6.1.xml.p10 @@ -0,0 +1,105 @@ + + + + + + + + + +