From fa4c934ee65a52bab570b195a6c2c6720119fa51 Mon Sep 17 00:00:00 2001 From: Jongduck You Date: Wed, 22 May 2024 11:16:26 +0000 Subject: [PATCH 1/9] Enable dynamic routing Enable dynamic routing feature for India, Israel, Taiwan, Singapore, Switzerland, Slovakia, Poland, Slovenia, and Bosnia and Herzegovina. Add emergency numbers requiring normal routing for India, Israel, France, Taiwan, Singapore, Switzerland, Guadeloupe, Slovakia, Poland, Reunion, Slovenia, and Bosnia and Herzegovina. Bug: 336759603 Test: build and manual test Change-Id: Ic9a3faccd43c12c30be42f800b2ab9781b46970b --- .../services/Telephony/res/values/config.xml | 38 +++++++++++++++++++ .../services/Telephony/res/values/config.xml | 38 +++++++++++++++++++ .../services/Telephony/res/values/config.xml | 38 +++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/caiman/overlay/packages/services/Telephony/res/values/config.xml b/caiman/overlay/packages/services/Telephony/res/values/config.xml index 5f0d3a5f..fc00abe0 100644 --- a/caiman/overlay/packages/services/Telephony/res/values/config.xml +++ b/caiman/overlay/packages/services/Telephony/res/values/config.xml @@ -17,6 +17,44 @@ + + true + + + + in + il + tw + sg + ch + sk + pl + si + ba + + + + + in,,101,102,103,108 + il,,101,102 + tw,,110,119 + sg,,995 + ch,,1414 + gp,,115,119,191,196,197,116000,116111,116117 + sk,,159 + pl,01,984,985,997,998,999 + pl,06,984,985,997,998,999 + pl,,986,987,989,991,992,993,994,995,996 + re,,115,119,191,196,197,116000,116111,116117 + si,,113 + ba,,122,123,124 + + diff --git a/komodo/overlay/packages/services/Telephony/res/values/config.xml b/komodo/overlay/packages/services/Telephony/res/values/config.xml index 5f0d3a5f..fc00abe0 100644 --- a/komodo/overlay/packages/services/Telephony/res/values/config.xml +++ b/komodo/overlay/packages/services/Telephony/res/values/config.xml @@ -17,6 +17,44 @@ + + true + + + + in + il + tw + sg + ch + sk + pl + si + ba + + + + + in,,101,102,103,108 + il,,101,102 + tw,,110,119 + sg,,995 + ch,,1414 + gp,,115,119,191,196,197,116000,116111,116117 + sk,,159 + pl,01,984,985,997,998,999 + pl,06,984,985,997,998,999 + pl,,986,987,989,991,992,993,994,995,996 + re,,115,119,191,196,197,116000,116111,116117 + si,,113 + ba,,122,123,124 + + diff --git a/tokay/overlay/packages/services/Telephony/res/values/config.xml b/tokay/overlay/packages/services/Telephony/res/values/config.xml index 5f0d3a5f..fc00abe0 100644 --- a/tokay/overlay/packages/services/Telephony/res/values/config.xml +++ b/tokay/overlay/packages/services/Telephony/res/values/config.xml @@ -17,6 +17,44 @@ + + true + + + + in + il + tw + sg + ch + sk + pl + si + ba + + + + + in,,101,102,103,108 + il,,101,102 + tw,,110,119 + sg,,995 + ch,,1414 + gp,,115,119,191,196,197,116000,116111,116117 + sk,,159 + pl,01,984,985,997,998,999 + pl,06,984,985,997,998,999 + pl,,986,987,989,991,992,993,994,995,996 + re,,115,119,191,196,197,116000,116111,116117 + si,,113 + ba,,122,123,124 + + From ad73a12698d893774eadfe29fde3f5cea7a0cda0 Mon Sep 17 00:00:00 2001 From: Allen Xu Date: Wed, 29 May 2024 18:01:14 +0000 Subject: [PATCH 2/9] Enable satellite eSOS persistent logging Bug: 343478281 Test: make Change-Id: I92c0001b45089a265de6e64568c32adcb270c22b --- .../core/res/res/values/config_telephony.xml | 21 +++++++++++++++++++ .../core/res/res/values/config_telephony.xml | 21 +++++++++++++++++++ .../core/res/res/values/config_telephony.xml | 21 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 caiman/overlay/frameworks/base/core/res/res/values/config_telephony.xml create mode 100644 komodo/overlay/frameworks/base/core/res/res/values/config_telephony.xml create mode 100644 tokay/overlay/frameworks/base/core/res/res/values/config_telephony.xml diff --git a/caiman/overlay/frameworks/base/core/res/res/values/config_telephony.xml b/caiman/overlay/frameworks/base/core/res/res/values/config_telephony.xml new file mode 100644 index 00000000..297e2111 --- /dev/null +++ b/caiman/overlay/frameworks/base/core/res/res/values/config_telephony.xml @@ -0,0 +1,21 @@ + + + + + + true + diff --git a/komodo/overlay/frameworks/base/core/res/res/values/config_telephony.xml b/komodo/overlay/frameworks/base/core/res/res/values/config_telephony.xml new file mode 100644 index 00000000..297e2111 --- /dev/null +++ b/komodo/overlay/frameworks/base/core/res/res/values/config_telephony.xml @@ -0,0 +1,21 @@ + + + + + + true + diff --git a/tokay/overlay/frameworks/base/core/res/res/values/config_telephony.xml b/tokay/overlay/frameworks/base/core/res/res/values/config_telephony.xml new file mode 100644 index 00000000..297e2111 --- /dev/null +++ b/tokay/overlay/frameworks/base/core/res/res/values/config_telephony.xml @@ -0,0 +1,21 @@ + + + + + + true + From 7d1de62cb22947bb0190168485bcdf64abff3d45 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Sat, 17 Feb 2024 11:04:51 +0800 Subject: [PATCH 3/9] gps: maintain one solution Bug: 315915958 Test: build pass and GPS function works Change-Id: Ibe6f2ce01b95dea8fca53dda4833a81262ebc63a Merged-In: Ibe6f2ce01b95dea8fca53dda4833a81262ebc63a --- device-caiman.mk | 15 -- device-komodo.mk | 15 -- device-ripcurrent24.mk | 15 -- device-ripcurrentpro.mk | 15 -- device-tokay.mk | 15 -- factory_caiman.mk | 12 -- factory_komodo.mk | 12 -- factory_ripcurrent24.mk | 12 -- factory_ripcurrentpro.mk | 12 -- factory_tokay.mk | 12 -- location/caiman/Android.bp | 108 +-------------- location/caiman/factory/gps.xml | 101 -------------- location/caiman/factory/lhd.conf | 33 ----- location/caiman/factory/scd.conf | 6 - location/caiman/gps.cer | 161 ---------------------- location/caiman/user/gps.xml | 103 -------------- location/caiman/user/lhd.conf | 31 ----- location/caiman/user/scd.conf | 5 - location/caiman/userdebug/gps.xml | 104 -------------- location/caiman/userdebug/lhd.conf | 33 ----- location/caiman/userdebug/scd.conf | 6 - location/komodo/Android.bp | 108 +-------------- location/komodo/factory/gps.xml | 101 -------------- location/komodo/factory/lhd.conf | 33 ----- location/komodo/factory/scd.conf | 6 - location/komodo/gps.cer | 161 ---------------------- location/komodo/user/gps.xml | 103 -------------- location/komodo/user/lhd.conf | 31 ----- location/komodo/user/scd.conf | 5 - location/komodo/userdebug/gps.xml | 104 -------------- location/komodo/userdebug/lhd.conf | 33 ----- location/komodo/userdebug/scd.conf | 6 - location/ripcurrent24/Android.bp | 108 +-------------- location/ripcurrent24/factory/gps.xml | 101 -------------- location/ripcurrent24/factory/lhd.conf | 33 ----- location/ripcurrent24/factory/scd.conf | 6 - location/ripcurrent24/gps.cer | 161 ---------------------- location/ripcurrent24/user/gps.xml | 103 -------------- location/ripcurrent24/user/lhd.conf | 31 ----- location/ripcurrent24/user/scd.conf | 5 - location/ripcurrent24/userdebug/gps.xml | 104 -------------- location/ripcurrent24/userdebug/lhd.conf | 33 ----- location/ripcurrent24/userdebug/scd.conf | 6 - location/ripcurrentpro/Android.bp | 108 +-------------- location/ripcurrentpro/factory/gps.xml | 101 -------------- location/ripcurrentpro/factory/lhd.conf | 33 ----- location/ripcurrentpro/factory/scd.conf | 6 - location/ripcurrentpro/gps.cer | 161 ---------------------- location/ripcurrentpro/user/gps.xml | 103 -------------- location/ripcurrentpro/user/lhd.conf | 31 ----- location/ripcurrentpro/user/scd.conf | 5 - location/ripcurrentpro/userdebug/gps.xml | 104 -------------- location/ripcurrentpro/userdebug/lhd.conf | 33 ----- location/ripcurrentpro/userdebug/scd.conf | 6 - location/tokay/Android.bp | 108 +-------------- location/tokay/factory/gps.xml | 101 -------------- location/tokay/factory/lhd.conf | 33 ----- location/tokay/factory/scd.conf | 6 - location/tokay/gps.cer | 161 ---------------------- location/tokay/user/gps.xml | 103 -------------- location/tokay/user/lhd.conf | 31 ----- location/tokay/user/scd.conf | 5 - location/tokay/userdebug/gps.xml | 104 -------------- location/tokay/userdebug/lhd.conf | 33 ----- location/tokay/userdebug/scd.conf | 6 - 65 files changed, 10 insertions(+), 3580 deletions(-) delete mode 100644 location/caiman/factory/gps.xml delete mode 100644 location/caiman/factory/lhd.conf delete mode 100644 location/caiman/factory/scd.conf delete mode 100644 location/caiman/gps.cer delete mode 100644 location/caiman/user/gps.xml delete mode 100644 location/caiman/user/lhd.conf delete mode 100644 location/caiman/user/scd.conf delete mode 100644 location/caiman/userdebug/gps.xml delete mode 100644 location/caiman/userdebug/lhd.conf delete mode 100644 location/caiman/userdebug/scd.conf delete mode 100644 location/komodo/factory/gps.xml delete mode 100644 location/komodo/factory/lhd.conf delete mode 100644 location/komodo/factory/scd.conf delete mode 100644 location/komodo/gps.cer delete mode 100644 location/komodo/user/gps.xml delete mode 100644 location/komodo/user/lhd.conf delete mode 100644 location/komodo/user/scd.conf delete mode 100644 location/komodo/userdebug/gps.xml delete mode 100644 location/komodo/userdebug/lhd.conf delete mode 100644 location/komodo/userdebug/scd.conf delete mode 100644 location/ripcurrent24/factory/gps.xml delete mode 100644 location/ripcurrent24/factory/lhd.conf delete mode 100644 location/ripcurrent24/factory/scd.conf delete mode 100644 location/ripcurrent24/gps.cer delete mode 100644 location/ripcurrent24/user/gps.xml delete mode 100644 location/ripcurrent24/user/lhd.conf delete mode 100644 location/ripcurrent24/user/scd.conf delete mode 100644 location/ripcurrent24/userdebug/gps.xml delete mode 100644 location/ripcurrent24/userdebug/lhd.conf delete mode 100644 location/ripcurrent24/userdebug/scd.conf delete mode 100644 location/ripcurrentpro/factory/gps.xml delete mode 100644 location/ripcurrentpro/factory/lhd.conf delete mode 100644 location/ripcurrentpro/factory/scd.conf delete mode 100644 location/ripcurrentpro/gps.cer delete mode 100644 location/ripcurrentpro/user/gps.xml delete mode 100644 location/ripcurrentpro/user/lhd.conf delete mode 100644 location/ripcurrentpro/user/scd.conf delete mode 100644 location/ripcurrentpro/userdebug/gps.xml delete mode 100644 location/ripcurrentpro/userdebug/lhd.conf delete mode 100644 location/ripcurrentpro/userdebug/scd.conf delete mode 100644 location/tokay/factory/gps.xml delete mode 100644 location/tokay/factory/lhd.conf delete mode 100644 location/tokay/factory/scd.conf delete mode 100644 location/tokay/gps.cer delete mode 100644 location/tokay/user/gps.xml delete mode 100644 location/tokay/user/lhd.conf delete mode 100644 location/tokay/user/scd.conf delete mode 100644 location/tokay/userdebug/gps.xml delete mode 100644 location/tokay/userdebug/lhd.conf delete mode 100644 location/tokay/userdebug/scd.conf diff --git a/device-caiman.mk b/device-caiman.mk index f4cb6b12..55a8b5f8 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -268,24 +268,9 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/caimito/caiman/uwb # Location -# iGNSS -# gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/caiman $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) PRODUCT_PACKAGES += gps.cfg -# eGNSS -# SDK build system -$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) -include device/google/gs-common/gps/brcm/device.mk -PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/caiman -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT) -PRODUCT_PACKAGES += \ - gps.cer \ - gps.xml \ - scd.conf \ - lhd.conf # Display LBE PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 diff --git a/device-komodo.mk b/device-komodo.mk index ac523b80..99a9ab2e 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -291,24 +291,9 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/caimito/komodo/uwb # Location -# iGNSS -# gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/komodo $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) PRODUCT_PACKAGES += gps.cfg -# eGNSS -# SDK build system -$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) -include device/google/gs-common/gps/brcm/device.mk -PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/komodo -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT) -PRODUCT_PACKAGES += \ - gps.cer \ - gps.xml \ - scd.conf \ - lhd.conf # Display LBE PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index b72f4d4b..f64ae6d5 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -217,25 +217,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location -# iGNSS # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrent24 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) PRODUCT_PACKAGES += gps.cfg -# eGNSS -# SDK build system -$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) -include device/google/gs-common/gps/brcm/device.mk - -PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrent24 -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT) -PRODUCT_PACKAGES += \ - gps.cer \ - gps.xml \ - scd.conf \ - lhd.conf PRODUCT_VENDOR_PROPERTIES += \ vendor.disable.thermal.control=1 \ diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index 69cf47a9..16e2a54a 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -219,24 +219,9 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location -# iGNSS -# gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrentpro $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) PRODUCT_PACKAGES += gps.cfg -# eGNSS -# SDK build system -$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) -include device/google/gs-common/gps/brcm/device.mk -PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrentpro -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT) -PRODUCT_PACKAGES += \ - gps.cer \ - gps.xml \ - scd.conf \ - lhd.conf PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true diff --git a/device-tokay.mk b/device-tokay.mk index 0601361c..7239eadf 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -257,24 +257,9 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location -# iGNSS -# gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) PRODUCT_PACKAGES += gps.cfg -# eGNSS -# SDK build system -$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) -include device/google/gs-common/gps/brcm/device.mk -PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT) -PRODUCT_PACKAGES += \ - gps.cer \ - gps.xml \ - scd.conf \ - lhd.conf # Display LBE PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 diff --git a/factory_caiman.mk b/factory_caiman.mk index dc4cd3ce..0bf7c826 100644 --- a/factory_caiman.mk +++ b/factory_caiman.mk @@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Location -# iGNSS PRODUCT_PACKAGES += \ sctd \ spad \ @@ -43,17 +42,6 @@ PRODUCT_PACKAGES += \ spad.json \ swcnd.json \ android.hardware.gnss@2.1-impl -# eGNSS -# Override to factory SDK -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += sdkv1 -SOONG_CONFIG_gpssdk_sdkv1 := true -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsmcuversion -SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT) -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf := factory # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool factory_lwis_client_test diff --git a/factory_komodo.mk b/factory_komodo.mk index 6d1cf6b7..952ed1da 100644 --- a/factory_komodo.mk +++ b/factory_komodo.mk @@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Location -# iGNSS PRODUCT_PACKAGES += \ sctd \ spad \ @@ -43,17 +42,6 @@ PRODUCT_PACKAGES += \ spad.json \ swcnd.json \ android.hardware.gnss@2.1-impl -# eGNSS -# Override to factory SDK -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += sdkv1 -SOONG_CONFIG_gpssdk_sdkv1 := true -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsmcuversion -SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT) -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf := factory # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool factory_lwis_client_test diff --git a/factory_ripcurrent24.mk b/factory_ripcurrent24.mk index 29eb39fc..644d0d6a 100644 --- a/factory_ripcurrent24.mk +++ b/factory_ripcurrent24.mk @@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Location -# iGNSS PRODUCT_PACKAGES += \ sctd \ spad \ @@ -43,17 +42,6 @@ PRODUCT_PACKAGES += \ spad.json \ swcnd.json \ android.hardware.gnss@2.1-impl -# eGNSS -# Override to factory SDK -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += sdkv1 -SOONG_CONFIG_gpssdk_sdkv1 := true -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsmcuversion -SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT) -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf := factory # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool fatp_tk4_front_hat_tool diff --git a/factory_ripcurrentpro.mk b/factory_ripcurrentpro.mk index 3038e8b4..f4f509ab 100644 --- a/factory_ripcurrentpro.mk +++ b/factory_ripcurrentpro.mk @@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Location -# iGNSS PRODUCT_PACKAGES += \ sctd \ spad \ @@ -43,17 +42,6 @@ PRODUCT_PACKAGES += \ spad.json \ swcnd.json \ android.hardware.gnss@2.1-impl -# eGNSS -# Override to factory SDK -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += sdkv1 -SOONG_CONFIG_gpssdk_sdkv1 := true -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsmcuversion -SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT) -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf := factory # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool fatp_tk4_front_hat_tool diff --git a/factory_tokay.mk b/factory_tokay.mk index 6574b5b9..77700943 100644 --- a/factory_tokay.mk +++ b/factory_tokay.mk @@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Location -# iGNSS PRODUCT_PACKAGES += \ sctd \ spad \ @@ -43,17 +42,6 @@ PRODUCT_PACKAGES += \ spad.json \ swcnd.json \ android.hardware.gnss@2.1-impl -# eGNSS -# Override to factory SDK -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += sdkv1 -SOONG_CONFIG_gpssdk_sdkv1 := true -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsmcuversion -SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT) -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf := factory # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_tk4_front_hat_tool factory_lwis_client_test diff --git a/location/caiman/Android.bp b/location/caiman/Android.bp index eadab4e5..eedc1fb8 100644 --- a/location/caiman/Android.bp +++ b/location/caiman/Android.bp @@ -5,7 +5,7 @@ package { } soong_config_module_type { - name: "ignss_prebuilt_etc", + name: "gnss_prebuilt_etc", module_type: "prebuilt_etc", config_namespace: "gpssdk", variables: [ @@ -25,7 +25,7 @@ soong_config_string_variable { ], } -ignss_prebuilt_etc { +gnss_prebuilt_etc { name: "gps.cfg", soong_config_variables: { buildtype: { @@ -46,107 +46,3 @@ ignss_prebuilt_etc { relative_install_path: "gnss", vendor: true, } - -soong_config_module_type { - name: "egnss_prebuilt_etc", - module_type: "prebuilt_etc", - config_namespace: "gpssdk", - variables: [ - "gpsconf", - ], - properties: [ - "src", - ], -} - -soong_config_string_variable { - name: "gpsconf", - values: [ - "factory", - "user", - "userdebug", - "eng", - ], -} - -prebuilt_etc { - name: "gps.cer", - src: "gps.cer", - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "gps.xml", - soong_config_variables: { - gpsconf: { - user: { - src: "user/gps.xml", - }, - userdebug: { - src: "userdebug/gps.xml", - }, - eng: { - src: "userdebug/gps.xml", - }, - factory: { - src: "factory/gps.xml", - }, - conditions_default: { - src: "user/gps.xml", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "lhd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/lhd.conf", - }, - userdebug: { - src: "userdebug/lhd.conf", - }, - eng: { - src: "userdebug/lhd.conf", - }, - factory: { - src: "factory/lhd.conf", - }, - conditions_default: { - src: "user/lhd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "scd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/scd.conf", - }, - userdebug: { - src: "userdebug/scd.conf", - }, - eng: { - src: "userdebug/scd.conf", - }, - factory: { - src: "factory/scd.conf", - }, - conditions_default: { - src: "user/scd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} diff --git a/location/caiman/factory/gps.xml b/location/caiman/factory/gps.xml deleted file mode 100644 index 89558834..00000000 --- a/location/caiman/factory/gps.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - diff --git a/location/caiman/factory/lhd.conf b/location/caiman/factory/lhd.conf deleted file mode 100644 index c430b93a..00000000 --- a/location/caiman/factory/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/caiman/factory/scd.conf b/location/caiman/factory/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/caiman/factory/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/caiman/gps.cer b/location/caiman/gps.cer deleted file mode 100644 index 934e0c5c..00000000 --- a/location/caiman/gps.cer +++ /dev/null @@ -1,161 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ -RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD -VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX -DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y -ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy -VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr -mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr -IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK -mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu -XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy -dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye -jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 -BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 -DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 -9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx -jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 -Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz -ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS -R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH -MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI -2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx -1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ -q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz -tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ -vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP -BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV -5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY -1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 -NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG -Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 -8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe -pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl -MrY= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFZTCCA02gAwIBAgIPAWv6o5fPZQ5hxva1vuNrMA0GCSqGSIb3DQEBCwUAMDgx -CzAJBgNVBAYTAkpQMRcwFQYDVQQKDA5SYWt1dGVuIE1vYmlsZTEQMA4GA1UEAwwH -Um9vdCBDQTAeFw0xOTA3MTYxMTU1NDJaFw0yOTA3MTMxMTU1NDJaMD4xCzAJBgNV -BAYTAkpQMRcwFQYDVQQKEw5SYWt1dGVuIE1vYmlsZTEWMBQGA1UEAxMNREMgSXNz -dWluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAObjAbQ8TkzF -A+/WvSE6fzDf+rlvBKY1dJJbiJ2/j0lc+tj56dE7+BhZ2JVmAYIYfEoUw69dwxTR -44EdZln3ZVFmMuOdfxvF9A46pMKzH1skr8ErDgjNyJ9f/JOuQ29p/7BvLC55aRzk -yj99BYdzJWKs+5W7jQlv7/HyJ/PQ+rUEBOx4o/YiTucDFduWdV6/x5mcEbKD3ufL -66vUEf3MHGegDkOWAMTchl1RmaYDlf3IMsXC7M2bFPFa/9y/vzaaY6EhnJ861co6 -rkOhTZe/kJZwqQYFmWczBPZK/9zRy3C1zA09tCBk+CDNBrNXe+3dMLFmnW4npxUQ -oceTPhaaDo5lA6HkkARwVWLrporFZ2B/th2Bqtu6uObLSB6JMA2jxmKwKukM8/jp -C9tKV9X03rHQIQultc63rivPdgQvqYgW1PVdzV1a3pZEMk5zv257+fxgfUGzfUh7 -tx0OY+BkykSP6ZK/BsbI/BY+rsS0L/0lmC22NU1p+qVeN3ZRHoqntB+FymaBfQ3/ -yfKkDNfnMua5GzLyyYGYUDDx71rtfrs3hGDiwjvE4B0IvsU0E7Oerk5gLqx8t0q/ -MmhI+CJJS1bH2sRBMcqfRAv+eyByFsvLY7Er/ztveaabX9xEwyPNFOcU+SZMhipv -EUKmUcOAHxzx4HbYEFyM0Z7WgUdlTd1xAgMBAAGjZjBkMB8GA1UdIwQYMBaAFPUI -BlLFno+y5xdHlCX349iVyS75MB0GA1UdDgQWBBQzVhTSCf8F31Zf0Bu661qymMko -JzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0B -AQsFAAOCAgEADQEufjma/6fT/Do4Fh13lZhsowHSsGv5sFYly6224GsciE80ZwYg -R4EK/TAR0jorBXsu6sQc51pZ5SSHhIxfo2frfprTPaaWN6cZwfrb6UcnD/FaZ1jP -HzWrI3kRxG9JCDffzE8uMf8Rnc69n1j+TBerk4Ix3Zui2TaaF6LVceJ4RgeNkZl0 -OFkGGFruHz/d83q7A6YjgN0iwMEabdtKH7Sq27LqGPeCS8NuGlrziNAxktdwaYlN -D5t6ntM/1nHYPmVqdioEU9vAnyB3BiXOlITPHEEMOSlItcUsJ6rN5DZJaJgkBxvN -Qdi6wmaDlxy8XFyy4KGFKWAl17FlfpqW5VtYQJ4aDpibGlGqamg0vm+IJDIGPlOs -KQcxG17cOw4MCflAtnzHKHBn52DegQKwxev2ZpqdwVw/NqPq0yTNEbCRqEyiq7+H -ljKEFiEjEjeXTcqR4DoCseA5UgcriuriV0OCvr8KTlviV4FEUu+IA9ut8YIvf2of -Zz0z8rO4H+Rb4tMi/yBRM09x3rEW4hXwO0qpCBNBa0wEJBxufF3f6l9efEle+YTR -XS92gutaoVluqMfRSJckjwWokToi32/FvF79guZymD0qHkOSi5dewsIW7zsdobvv -t2CWLfTAb9cx222ELBpVPkfcgUKfF4RCGWPzuAlK6OueuDrInOiz8ag= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFUjCCAzqgAwIBAgICBpAwDQYJKoZIhvcNAQELBQAwODELMAkGA1UEBhMCSlAx -FzAVBgNVBAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMB4XDTE5 -MDcxNjEwNTkwMVoXDTM5MDcxNTEwNTkwMVowODELMAkGA1UEBhMCSlAxFzAVBgNV -BAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAqiPMbNudotG8afkk5Fwo2QdDcFFmC+qGpGjw -yQs57QtGPRk1HsIhZFfr6zn8t1tZw6Zo+A0biFA7d2N93nYsseHBy/bZlhhOL+Js -Jb907UM09L5xaJIgnbFYVT1QjtB7ksLAy3rHpdSKiggfT1ynwM/u6wIdWRSx24QU -Vxpq5iFpVj041+/RnpCPASL5pSnbYZKQyOb/XsOaR+hz7aSjwiUzk2cRjAmRqYxY -qYVe135IAy377inJRtUPvi3IhtmUHJToiMLBH5tChkjkIpdRG1lVIj4vGdzrIb+Q -Kvg/k7BDVZ3sstsLvJ8evNonBzrqcr80ek/X+HFrgY/3M1VEru4ohLAiA877CuuG -UAfrxFh9qjP1yue+dlrQWk+WHMbGMzKI1zCKEMphJatyNHfpRtD8LUWtLV96DD78 -qLwQwrSYrEMd2u/akeBFKINYWqpqkVBhSsV3eukXVIdSbtSAxZNv+4m6QddEcUvG -2ZLf+yCf2tl+LPGXNL08vwMVbQqcDw8m+nDP4vu0VUixddyoqnnDlWOoQESuQFQ1 -IqYFQhRPs2dFRf5TJzkmbqRUXbaPxsrKGjTtVpPgENbv40nyRGyBbl1CzqpBFEp5 -7w4MPYDIzWKYbRyCnUE5WScRBFmym7242KA3SOfkylzGMb8KGJxohVME+7oMbNf5 -EjLWVgECAwEAAaNmMGQwHwYDVR0jBBgwFoAU9QgGUsWej7LnF0eUJffj2JXJLvkw -HQYDVR0OBBYEFPUIBlLFno+y5xdHlCX349iVyS75MA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCDGIeYrtivFt3p -8k5vXKFUT072C7wMvfrAGYCYgIdUthWCqJoMwnG3Fsg7Ngu70La7ESBzEKpnpPWz -eIdnREJkNP9iqiKHXnaUV2P/21AS1q6enVKBFOl7dYiVjqOZ+vac3a1UjLWkvm0g -x4sg/f3PpiEzZM7ecnQYk2wfMSq8Jw0w1Lf0SEeoYZTkf12cqSJVSa/G7gEdL/Cn -LO3yyBq0KPNdd87eIfvCLJj55UJ5dCr0JXRTUteBvJwflbPXmOqfI8fA05fwlJZS -o1SBpMI9cEBwaPXQM9CPNKaWLvyOR1KpviRzbCnaKf44Fs2OuZboo3avZrC9eUoU -HU2HKXRj8UMRlFeCdNugbOdGyK+CpXwMHVtIrtpf0iOUqo0rOekgnUSNi9qyjD1g -IV3Y/NLVl9fqe8q66IWUn8NYndxigMKWcMCBFUjfP0yMZeqSHFiIv7zk9PuV/62k -Yele7cK9iHnEUwWBj6VCEs6pZBS1QSmhRw3GWlSDc/gHXd38PG20zH7xg4z2H9Rc -Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc -Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ -HInwg85pGm+sEkYbYFRBD0woPBsL3g== ------END CERTIFICATE----- diff --git a/location/caiman/user/gps.xml b/location/caiman/user/gps.xml deleted file mode 100644 index 6c335c52..00000000 --- a/location/caiman/user/gps.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - diff --git a/location/caiman/user/lhd.conf b/location/caiman/user/lhd.conf deleted file mode 100644 index 73e03bcc..00000000 --- a/location/caiman/user/lhd.conf +++ /dev/null @@ -1,31 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.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/location/caiman/user/scd.conf b/location/caiman/user/scd.conf deleted file mode 100644 index e75f209b..00000000 --- a/location/caiman/user/scd.conf +++ /dev/null @@ -1,5 +0,0 @@ -LogEnabled=false -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 diff --git a/location/caiman/userdebug/gps.xml b/location/caiman/userdebug/gps.xml deleted file mode 100644 index 0686861c..00000000 --- a/location/caiman/userdebug/gps.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - diff --git a/location/caiman/userdebug/lhd.conf b/location/caiman/userdebug/lhd.conf deleted file mode 100644 index c430b93a..00000000 --- a/location/caiman/userdebug/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/caiman/userdebug/scd.conf b/location/caiman/userdebug/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/caiman/userdebug/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/komodo/Android.bp b/location/komodo/Android.bp index eadab4e5..eedc1fb8 100644 --- a/location/komodo/Android.bp +++ b/location/komodo/Android.bp @@ -5,7 +5,7 @@ package { } soong_config_module_type { - name: "ignss_prebuilt_etc", + name: "gnss_prebuilt_etc", module_type: "prebuilt_etc", config_namespace: "gpssdk", variables: [ @@ -25,7 +25,7 @@ soong_config_string_variable { ], } -ignss_prebuilt_etc { +gnss_prebuilt_etc { name: "gps.cfg", soong_config_variables: { buildtype: { @@ -46,107 +46,3 @@ ignss_prebuilt_etc { relative_install_path: "gnss", vendor: true, } - -soong_config_module_type { - name: "egnss_prebuilt_etc", - module_type: "prebuilt_etc", - config_namespace: "gpssdk", - variables: [ - "gpsconf", - ], - properties: [ - "src", - ], -} - -soong_config_string_variable { - name: "gpsconf", - values: [ - "factory", - "user", - "userdebug", - "eng", - ], -} - -prebuilt_etc { - name: "gps.cer", - src: "gps.cer", - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "gps.xml", - soong_config_variables: { - gpsconf: { - user: { - src: "user/gps.xml", - }, - userdebug: { - src: "userdebug/gps.xml", - }, - eng: { - src: "userdebug/gps.xml", - }, - factory: { - src: "factory/gps.xml", - }, - conditions_default: { - src: "user/gps.xml", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "lhd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/lhd.conf", - }, - userdebug: { - src: "userdebug/lhd.conf", - }, - eng: { - src: "userdebug/lhd.conf", - }, - factory: { - src: "factory/lhd.conf", - }, - conditions_default: { - src: "user/lhd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "scd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/scd.conf", - }, - userdebug: { - src: "userdebug/scd.conf", - }, - eng: { - src: "userdebug/scd.conf", - }, - factory: { - src: "factory/scd.conf", - }, - conditions_default: { - src: "user/scd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} diff --git a/location/komodo/factory/gps.xml b/location/komodo/factory/gps.xml deleted file mode 100644 index 89558834..00000000 --- a/location/komodo/factory/gps.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - diff --git a/location/komodo/factory/lhd.conf b/location/komodo/factory/lhd.conf deleted file mode 100644 index c430b93a..00000000 --- a/location/komodo/factory/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/komodo/factory/scd.conf b/location/komodo/factory/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/komodo/factory/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/komodo/gps.cer b/location/komodo/gps.cer deleted file mode 100644 index 934e0c5c..00000000 --- a/location/komodo/gps.cer +++ /dev/null @@ -1,161 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ -RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD -VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX -DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y -ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy -VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr -mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr -IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK -mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu -XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy -dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye -jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 -BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 -DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 -9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx -jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 -Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz -ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS -R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH -MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI -2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx -1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ -q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz -tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ -vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP -BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV -5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY -1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 -NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG -Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 -8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe -pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl -MrY= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFZTCCA02gAwIBAgIPAWv6o5fPZQ5hxva1vuNrMA0GCSqGSIb3DQEBCwUAMDgx -CzAJBgNVBAYTAkpQMRcwFQYDVQQKDA5SYWt1dGVuIE1vYmlsZTEQMA4GA1UEAwwH -Um9vdCBDQTAeFw0xOTA3MTYxMTU1NDJaFw0yOTA3MTMxMTU1NDJaMD4xCzAJBgNV -BAYTAkpQMRcwFQYDVQQKEw5SYWt1dGVuIE1vYmlsZTEWMBQGA1UEAxMNREMgSXNz -dWluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAObjAbQ8TkzF -A+/WvSE6fzDf+rlvBKY1dJJbiJ2/j0lc+tj56dE7+BhZ2JVmAYIYfEoUw69dwxTR -44EdZln3ZVFmMuOdfxvF9A46pMKzH1skr8ErDgjNyJ9f/JOuQ29p/7BvLC55aRzk -yj99BYdzJWKs+5W7jQlv7/HyJ/PQ+rUEBOx4o/YiTucDFduWdV6/x5mcEbKD3ufL -66vUEf3MHGegDkOWAMTchl1RmaYDlf3IMsXC7M2bFPFa/9y/vzaaY6EhnJ861co6 -rkOhTZe/kJZwqQYFmWczBPZK/9zRy3C1zA09tCBk+CDNBrNXe+3dMLFmnW4npxUQ -oceTPhaaDo5lA6HkkARwVWLrporFZ2B/th2Bqtu6uObLSB6JMA2jxmKwKukM8/jp -C9tKV9X03rHQIQultc63rivPdgQvqYgW1PVdzV1a3pZEMk5zv257+fxgfUGzfUh7 -tx0OY+BkykSP6ZK/BsbI/BY+rsS0L/0lmC22NU1p+qVeN3ZRHoqntB+FymaBfQ3/ -yfKkDNfnMua5GzLyyYGYUDDx71rtfrs3hGDiwjvE4B0IvsU0E7Oerk5gLqx8t0q/ -MmhI+CJJS1bH2sRBMcqfRAv+eyByFsvLY7Er/ztveaabX9xEwyPNFOcU+SZMhipv -EUKmUcOAHxzx4HbYEFyM0Z7WgUdlTd1xAgMBAAGjZjBkMB8GA1UdIwQYMBaAFPUI -BlLFno+y5xdHlCX349iVyS75MB0GA1UdDgQWBBQzVhTSCf8F31Zf0Bu661qymMko -JzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0B -AQsFAAOCAgEADQEufjma/6fT/Do4Fh13lZhsowHSsGv5sFYly6224GsciE80ZwYg -R4EK/TAR0jorBXsu6sQc51pZ5SSHhIxfo2frfprTPaaWN6cZwfrb6UcnD/FaZ1jP -HzWrI3kRxG9JCDffzE8uMf8Rnc69n1j+TBerk4Ix3Zui2TaaF6LVceJ4RgeNkZl0 -OFkGGFruHz/d83q7A6YjgN0iwMEabdtKH7Sq27LqGPeCS8NuGlrziNAxktdwaYlN -D5t6ntM/1nHYPmVqdioEU9vAnyB3BiXOlITPHEEMOSlItcUsJ6rN5DZJaJgkBxvN -Qdi6wmaDlxy8XFyy4KGFKWAl17FlfpqW5VtYQJ4aDpibGlGqamg0vm+IJDIGPlOs -KQcxG17cOw4MCflAtnzHKHBn52DegQKwxev2ZpqdwVw/NqPq0yTNEbCRqEyiq7+H -ljKEFiEjEjeXTcqR4DoCseA5UgcriuriV0OCvr8KTlviV4FEUu+IA9ut8YIvf2of -Zz0z8rO4H+Rb4tMi/yBRM09x3rEW4hXwO0qpCBNBa0wEJBxufF3f6l9efEle+YTR -XS92gutaoVluqMfRSJckjwWokToi32/FvF79guZymD0qHkOSi5dewsIW7zsdobvv -t2CWLfTAb9cx222ELBpVPkfcgUKfF4RCGWPzuAlK6OueuDrInOiz8ag= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFUjCCAzqgAwIBAgICBpAwDQYJKoZIhvcNAQELBQAwODELMAkGA1UEBhMCSlAx -FzAVBgNVBAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMB4XDTE5 -MDcxNjEwNTkwMVoXDTM5MDcxNTEwNTkwMVowODELMAkGA1UEBhMCSlAxFzAVBgNV -BAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAqiPMbNudotG8afkk5Fwo2QdDcFFmC+qGpGjw -yQs57QtGPRk1HsIhZFfr6zn8t1tZw6Zo+A0biFA7d2N93nYsseHBy/bZlhhOL+Js -Jb907UM09L5xaJIgnbFYVT1QjtB7ksLAy3rHpdSKiggfT1ynwM/u6wIdWRSx24QU -Vxpq5iFpVj041+/RnpCPASL5pSnbYZKQyOb/XsOaR+hz7aSjwiUzk2cRjAmRqYxY -qYVe135IAy377inJRtUPvi3IhtmUHJToiMLBH5tChkjkIpdRG1lVIj4vGdzrIb+Q -Kvg/k7BDVZ3sstsLvJ8evNonBzrqcr80ek/X+HFrgY/3M1VEru4ohLAiA877CuuG -UAfrxFh9qjP1yue+dlrQWk+WHMbGMzKI1zCKEMphJatyNHfpRtD8LUWtLV96DD78 -qLwQwrSYrEMd2u/akeBFKINYWqpqkVBhSsV3eukXVIdSbtSAxZNv+4m6QddEcUvG -2ZLf+yCf2tl+LPGXNL08vwMVbQqcDw8m+nDP4vu0VUixddyoqnnDlWOoQESuQFQ1 -IqYFQhRPs2dFRf5TJzkmbqRUXbaPxsrKGjTtVpPgENbv40nyRGyBbl1CzqpBFEp5 -7w4MPYDIzWKYbRyCnUE5WScRBFmym7242KA3SOfkylzGMb8KGJxohVME+7oMbNf5 -EjLWVgECAwEAAaNmMGQwHwYDVR0jBBgwFoAU9QgGUsWej7LnF0eUJffj2JXJLvkw -HQYDVR0OBBYEFPUIBlLFno+y5xdHlCX349iVyS75MA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCDGIeYrtivFt3p -8k5vXKFUT072C7wMvfrAGYCYgIdUthWCqJoMwnG3Fsg7Ngu70La7ESBzEKpnpPWz -eIdnREJkNP9iqiKHXnaUV2P/21AS1q6enVKBFOl7dYiVjqOZ+vac3a1UjLWkvm0g -x4sg/f3PpiEzZM7ecnQYk2wfMSq8Jw0w1Lf0SEeoYZTkf12cqSJVSa/G7gEdL/Cn -LO3yyBq0KPNdd87eIfvCLJj55UJ5dCr0JXRTUteBvJwflbPXmOqfI8fA05fwlJZS -o1SBpMI9cEBwaPXQM9CPNKaWLvyOR1KpviRzbCnaKf44Fs2OuZboo3avZrC9eUoU -HU2HKXRj8UMRlFeCdNugbOdGyK+CpXwMHVtIrtpf0iOUqo0rOekgnUSNi9qyjD1g -IV3Y/NLVl9fqe8q66IWUn8NYndxigMKWcMCBFUjfP0yMZeqSHFiIv7zk9PuV/62k -Yele7cK9iHnEUwWBj6VCEs6pZBS1QSmhRw3GWlSDc/gHXd38PG20zH7xg4z2H9Rc -Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc -Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ -HInwg85pGm+sEkYbYFRBD0woPBsL3g== ------END CERTIFICATE----- diff --git a/location/komodo/user/gps.xml b/location/komodo/user/gps.xml deleted file mode 100644 index 6c335c52..00000000 --- a/location/komodo/user/gps.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - diff --git a/location/komodo/user/lhd.conf b/location/komodo/user/lhd.conf deleted file mode 100644 index 73e03bcc..00000000 --- a/location/komodo/user/lhd.conf +++ /dev/null @@ -1,31 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.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/location/komodo/user/scd.conf b/location/komodo/user/scd.conf deleted file mode 100644 index e75f209b..00000000 --- a/location/komodo/user/scd.conf +++ /dev/null @@ -1,5 +0,0 @@ -LogEnabled=false -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 diff --git a/location/komodo/userdebug/gps.xml b/location/komodo/userdebug/gps.xml deleted file mode 100644 index 0686861c..00000000 --- a/location/komodo/userdebug/gps.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - diff --git a/location/komodo/userdebug/lhd.conf b/location/komodo/userdebug/lhd.conf deleted file mode 100644 index c430b93a..00000000 --- a/location/komodo/userdebug/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/komodo/userdebug/scd.conf b/location/komodo/userdebug/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/komodo/userdebug/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/ripcurrent24/Android.bp b/location/ripcurrent24/Android.bp index eadab4e5..eedc1fb8 100644 --- a/location/ripcurrent24/Android.bp +++ b/location/ripcurrent24/Android.bp @@ -5,7 +5,7 @@ package { } soong_config_module_type { - name: "ignss_prebuilt_etc", + name: "gnss_prebuilt_etc", module_type: "prebuilt_etc", config_namespace: "gpssdk", variables: [ @@ -25,7 +25,7 @@ soong_config_string_variable { ], } -ignss_prebuilt_etc { +gnss_prebuilt_etc { name: "gps.cfg", soong_config_variables: { buildtype: { @@ -46,107 +46,3 @@ ignss_prebuilt_etc { relative_install_path: "gnss", vendor: true, } - -soong_config_module_type { - name: "egnss_prebuilt_etc", - module_type: "prebuilt_etc", - config_namespace: "gpssdk", - variables: [ - "gpsconf", - ], - properties: [ - "src", - ], -} - -soong_config_string_variable { - name: "gpsconf", - values: [ - "factory", - "user", - "userdebug", - "eng", - ], -} - -prebuilt_etc { - name: "gps.cer", - src: "gps.cer", - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "gps.xml", - soong_config_variables: { - gpsconf: { - user: { - src: "user/gps.xml", - }, - userdebug: { - src: "userdebug/gps.xml", - }, - eng: { - src: "userdebug/gps.xml", - }, - factory: { - src: "factory/gps.xml", - }, - conditions_default: { - src: "user/gps.xml", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "lhd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/lhd.conf", - }, - userdebug: { - src: "userdebug/lhd.conf", - }, - eng: { - src: "userdebug/lhd.conf", - }, - factory: { - src: "factory/lhd.conf", - }, - conditions_default: { - src: "user/lhd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "scd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/scd.conf", - }, - userdebug: { - src: "userdebug/scd.conf", - }, - eng: { - src: "userdebug/scd.conf", - }, - factory: { - src: "factory/scd.conf", - }, - conditions_default: { - src: "user/scd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} diff --git a/location/ripcurrent24/factory/gps.xml b/location/ripcurrent24/factory/gps.xml deleted file mode 100644 index 89558834..00000000 --- a/location/ripcurrent24/factory/gps.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - diff --git a/location/ripcurrent24/factory/lhd.conf b/location/ripcurrent24/factory/lhd.conf deleted file mode 100644 index c430b93a..00000000 --- a/location/ripcurrent24/factory/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/ripcurrent24/factory/scd.conf b/location/ripcurrent24/factory/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/ripcurrent24/factory/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/ripcurrent24/gps.cer b/location/ripcurrent24/gps.cer deleted file mode 100644 index 934e0c5c..00000000 --- a/location/ripcurrent24/gps.cer +++ /dev/null @@ -1,161 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ -RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD -VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX -DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y -ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy -VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr -mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr -IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK -mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu -XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy -dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye -jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 -BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 -DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 -9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx -jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 -Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz -ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS -R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH -MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI -2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx -1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ -q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz -tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ -vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP -BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV -5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY -1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 -NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG -Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 -8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe -pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl -MrY= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFZTCCA02gAwIBAgIPAWv6o5fPZQ5hxva1vuNrMA0GCSqGSIb3DQEBCwUAMDgx -CzAJBgNVBAYTAkpQMRcwFQYDVQQKDA5SYWt1dGVuIE1vYmlsZTEQMA4GA1UEAwwH -Um9vdCBDQTAeFw0xOTA3MTYxMTU1NDJaFw0yOTA3MTMxMTU1NDJaMD4xCzAJBgNV -BAYTAkpQMRcwFQYDVQQKEw5SYWt1dGVuIE1vYmlsZTEWMBQGA1UEAxMNREMgSXNz -dWluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAObjAbQ8TkzF -A+/WvSE6fzDf+rlvBKY1dJJbiJ2/j0lc+tj56dE7+BhZ2JVmAYIYfEoUw69dwxTR -44EdZln3ZVFmMuOdfxvF9A46pMKzH1skr8ErDgjNyJ9f/JOuQ29p/7BvLC55aRzk -yj99BYdzJWKs+5W7jQlv7/HyJ/PQ+rUEBOx4o/YiTucDFduWdV6/x5mcEbKD3ufL -66vUEf3MHGegDkOWAMTchl1RmaYDlf3IMsXC7M2bFPFa/9y/vzaaY6EhnJ861co6 -rkOhTZe/kJZwqQYFmWczBPZK/9zRy3C1zA09tCBk+CDNBrNXe+3dMLFmnW4npxUQ -oceTPhaaDo5lA6HkkARwVWLrporFZ2B/th2Bqtu6uObLSB6JMA2jxmKwKukM8/jp -C9tKV9X03rHQIQultc63rivPdgQvqYgW1PVdzV1a3pZEMk5zv257+fxgfUGzfUh7 -tx0OY+BkykSP6ZK/BsbI/BY+rsS0L/0lmC22NU1p+qVeN3ZRHoqntB+FymaBfQ3/ -yfKkDNfnMua5GzLyyYGYUDDx71rtfrs3hGDiwjvE4B0IvsU0E7Oerk5gLqx8t0q/ -MmhI+CJJS1bH2sRBMcqfRAv+eyByFsvLY7Er/ztveaabX9xEwyPNFOcU+SZMhipv -EUKmUcOAHxzx4HbYEFyM0Z7WgUdlTd1xAgMBAAGjZjBkMB8GA1UdIwQYMBaAFPUI -BlLFno+y5xdHlCX349iVyS75MB0GA1UdDgQWBBQzVhTSCf8F31Zf0Bu661qymMko -JzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0B -AQsFAAOCAgEADQEufjma/6fT/Do4Fh13lZhsowHSsGv5sFYly6224GsciE80ZwYg -R4EK/TAR0jorBXsu6sQc51pZ5SSHhIxfo2frfprTPaaWN6cZwfrb6UcnD/FaZ1jP -HzWrI3kRxG9JCDffzE8uMf8Rnc69n1j+TBerk4Ix3Zui2TaaF6LVceJ4RgeNkZl0 -OFkGGFruHz/d83q7A6YjgN0iwMEabdtKH7Sq27LqGPeCS8NuGlrziNAxktdwaYlN -D5t6ntM/1nHYPmVqdioEU9vAnyB3BiXOlITPHEEMOSlItcUsJ6rN5DZJaJgkBxvN -Qdi6wmaDlxy8XFyy4KGFKWAl17FlfpqW5VtYQJ4aDpibGlGqamg0vm+IJDIGPlOs -KQcxG17cOw4MCflAtnzHKHBn52DegQKwxev2ZpqdwVw/NqPq0yTNEbCRqEyiq7+H -ljKEFiEjEjeXTcqR4DoCseA5UgcriuriV0OCvr8KTlviV4FEUu+IA9ut8YIvf2of -Zz0z8rO4H+Rb4tMi/yBRM09x3rEW4hXwO0qpCBNBa0wEJBxufF3f6l9efEle+YTR -XS92gutaoVluqMfRSJckjwWokToi32/FvF79guZymD0qHkOSi5dewsIW7zsdobvv -t2CWLfTAb9cx222ELBpVPkfcgUKfF4RCGWPzuAlK6OueuDrInOiz8ag= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFUjCCAzqgAwIBAgICBpAwDQYJKoZIhvcNAQELBQAwODELMAkGA1UEBhMCSlAx -FzAVBgNVBAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMB4XDTE5 -MDcxNjEwNTkwMVoXDTM5MDcxNTEwNTkwMVowODELMAkGA1UEBhMCSlAxFzAVBgNV -BAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAqiPMbNudotG8afkk5Fwo2QdDcFFmC+qGpGjw -yQs57QtGPRk1HsIhZFfr6zn8t1tZw6Zo+A0biFA7d2N93nYsseHBy/bZlhhOL+Js -Jb907UM09L5xaJIgnbFYVT1QjtB7ksLAy3rHpdSKiggfT1ynwM/u6wIdWRSx24QU -Vxpq5iFpVj041+/RnpCPASL5pSnbYZKQyOb/XsOaR+hz7aSjwiUzk2cRjAmRqYxY -qYVe135IAy377inJRtUPvi3IhtmUHJToiMLBH5tChkjkIpdRG1lVIj4vGdzrIb+Q -Kvg/k7BDVZ3sstsLvJ8evNonBzrqcr80ek/X+HFrgY/3M1VEru4ohLAiA877CuuG -UAfrxFh9qjP1yue+dlrQWk+WHMbGMzKI1zCKEMphJatyNHfpRtD8LUWtLV96DD78 -qLwQwrSYrEMd2u/akeBFKINYWqpqkVBhSsV3eukXVIdSbtSAxZNv+4m6QddEcUvG -2ZLf+yCf2tl+LPGXNL08vwMVbQqcDw8m+nDP4vu0VUixddyoqnnDlWOoQESuQFQ1 -IqYFQhRPs2dFRf5TJzkmbqRUXbaPxsrKGjTtVpPgENbv40nyRGyBbl1CzqpBFEp5 -7w4MPYDIzWKYbRyCnUE5WScRBFmym7242KA3SOfkylzGMb8KGJxohVME+7oMbNf5 -EjLWVgECAwEAAaNmMGQwHwYDVR0jBBgwFoAU9QgGUsWej7LnF0eUJffj2JXJLvkw -HQYDVR0OBBYEFPUIBlLFno+y5xdHlCX349iVyS75MA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCDGIeYrtivFt3p -8k5vXKFUT072C7wMvfrAGYCYgIdUthWCqJoMwnG3Fsg7Ngu70La7ESBzEKpnpPWz -eIdnREJkNP9iqiKHXnaUV2P/21AS1q6enVKBFOl7dYiVjqOZ+vac3a1UjLWkvm0g -x4sg/f3PpiEzZM7ecnQYk2wfMSq8Jw0w1Lf0SEeoYZTkf12cqSJVSa/G7gEdL/Cn -LO3yyBq0KPNdd87eIfvCLJj55UJ5dCr0JXRTUteBvJwflbPXmOqfI8fA05fwlJZS -o1SBpMI9cEBwaPXQM9CPNKaWLvyOR1KpviRzbCnaKf44Fs2OuZboo3avZrC9eUoU -HU2HKXRj8UMRlFeCdNugbOdGyK+CpXwMHVtIrtpf0iOUqo0rOekgnUSNi9qyjD1g -IV3Y/NLVl9fqe8q66IWUn8NYndxigMKWcMCBFUjfP0yMZeqSHFiIv7zk9PuV/62k -Yele7cK9iHnEUwWBj6VCEs6pZBS1QSmhRw3GWlSDc/gHXd38PG20zH7xg4z2H9Rc -Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc -Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ -HInwg85pGm+sEkYbYFRBD0woPBsL3g== ------END CERTIFICATE----- diff --git a/location/ripcurrent24/user/gps.xml b/location/ripcurrent24/user/gps.xml deleted file mode 100644 index 6c335c52..00000000 --- a/location/ripcurrent24/user/gps.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - diff --git a/location/ripcurrent24/user/lhd.conf b/location/ripcurrent24/user/lhd.conf deleted file mode 100644 index 73e03bcc..00000000 --- a/location/ripcurrent24/user/lhd.conf +++ /dev/null @@ -1,31 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.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/location/ripcurrent24/user/scd.conf b/location/ripcurrent24/user/scd.conf deleted file mode 100644 index e75f209b..00000000 --- a/location/ripcurrent24/user/scd.conf +++ /dev/null @@ -1,5 +0,0 @@ -LogEnabled=false -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 diff --git a/location/ripcurrent24/userdebug/gps.xml b/location/ripcurrent24/userdebug/gps.xml deleted file mode 100644 index 0686861c..00000000 --- a/location/ripcurrent24/userdebug/gps.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - diff --git a/location/ripcurrent24/userdebug/lhd.conf b/location/ripcurrent24/userdebug/lhd.conf deleted file mode 100644 index c430b93a..00000000 --- a/location/ripcurrent24/userdebug/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/ripcurrent24/userdebug/scd.conf b/location/ripcurrent24/userdebug/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/ripcurrent24/userdebug/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/ripcurrentpro/Android.bp b/location/ripcurrentpro/Android.bp index eadab4e5..eedc1fb8 100644 --- a/location/ripcurrentpro/Android.bp +++ b/location/ripcurrentpro/Android.bp @@ -5,7 +5,7 @@ package { } soong_config_module_type { - name: "ignss_prebuilt_etc", + name: "gnss_prebuilt_etc", module_type: "prebuilt_etc", config_namespace: "gpssdk", variables: [ @@ -25,7 +25,7 @@ soong_config_string_variable { ], } -ignss_prebuilt_etc { +gnss_prebuilt_etc { name: "gps.cfg", soong_config_variables: { buildtype: { @@ -46,107 +46,3 @@ ignss_prebuilt_etc { relative_install_path: "gnss", vendor: true, } - -soong_config_module_type { - name: "egnss_prebuilt_etc", - module_type: "prebuilt_etc", - config_namespace: "gpssdk", - variables: [ - "gpsconf", - ], - properties: [ - "src", - ], -} - -soong_config_string_variable { - name: "gpsconf", - values: [ - "factory", - "user", - "userdebug", - "eng", - ], -} - -prebuilt_etc { - name: "gps.cer", - src: "gps.cer", - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "gps.xml", - soong_config_variables: { - gpsconf: { - user: { - src: "user/gps.xml", - }, - userdebug: { - src: "userdebug/gps.xml", - }, - eng: { - src: "userdebug/gps.xml", - }, - factory: { - src: "factory/gps.xml", - }, - conditions_default: { - src: "user/gps.xml", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "lhd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/lhd.conf", - }, - userdebug: { - src: "userdebug/lhd.conf", - }, - eng: { - src: "userdebug/lhd.conf", - }, - factory: { - src: "factory/lhd.conf", - }, - conditions_default: { - src: "user/lhd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "scd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/scd.conf", - }, - userdebug: { - src: "userdebug/scd.conf", - }, - eng: { - src: "userdebug/scd.conf", - }, - factory: { - src: "factory/scd.conf", - }, - conditions_default: { - src: "user/scd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} diff --git a/location/ripcurrentpro/factory/gps.xml b/location/ripcurrentpro/factory/gps.xml deleted file mode 100644 index 89558834..00000000 --- a/location/ripcurrentpro/factory/gps.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - diff --git a/location/ripcurrentpro/factory/lhd.conf b/location/ripcurrentpro/factory/lhd.conf deleted file mode 100644 index c430b93a..00000000 --- a/location/ripcurrentpro/factory/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/ripcurrentpro/factory/scd.conf b/location/ripcurrentpro/factory/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/ripcurrentpro/factory/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/ripcurrentpro/gps.cer b/location/ripcurrentpro/gps.cer deleted file mode 100644 index 934e0c5c..00000000 --- a/location/ripcurrentpro/gps.cer +++ /dev/null @@ -1,161 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ -RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD -VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX -DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y -ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy -VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr -mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr -IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK -mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu -XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy -dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye -jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 -BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 -DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 -9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx -jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 -Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz -ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS -R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH -MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI -2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx -1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ -q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz -tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ -vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP -BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV -5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY -1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 -NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG -Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 -8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe -pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl -MrY= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFZTCCA02gAwIBAgIPAWv6o5fPZQ5hxva1vuNrMA0GCSqGSIb3DQEBCwUAMDgx -CzAJBgNVBAYTAkpQMRcwFQYDVQQKDA5SYWt1dGVuIE1vYmlsZTEQMA4GA1UEAwwH -Um9vdCBDQTAeFw0xOTA3MTYxMTU1NDJaFw0yOTA3MTMxMTU1NDJaMD4xCzAJBgNV -BAYTAkpQMRcwFQYDVQQKEw5SYWt1dGVuIE1vYmlsZTEWMBQGA1UEAxMNREMgSXNz -dWluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAObjAbQ8TkzF -A+/WvSE6fzDf+rlvBKY1dJJbiJ2/j0lc+tj56dE7+BhZ2JVmAYIYfEoUw69dwxTR -44EdZln3ZVFmMuOdfxvF9A46pMKzH1skr8ErDgjNyJ9f/JOuQ29p/7BvLC55aRzk -yj99BYdzJWKs+5W7jQlv7/HyJ/PQ+rUEBOx4o/YiTucDFduWdV6/x5mcEbKD3ufL -66vUEf3MHGegDkOWAMTchl1RmaYDlf3IMsXC7M2bFPFa/9y/vzaaY6EhnJ861co6 -rkOhTZe/kJZwqQYFmWczBPZK/9zRy3C1zA09tCBk+CDNBrNXe+3dMLFmnW4npxUQ -oceTPhaaDo5lA6HkkARwVWLrporFZ2B/th2Bqtu6uObLSB6JMA2jxmKwKukM8/jp -C9tKV9X03rHQIQultc63rivPdgQvqYgW1PVdzV1a3pZEMk5zv257+fxgfUGzfUh7 -tx0OY+BkykSP6ZK/BsbI/BY+rsS0L/0lmC22NU1p+qVeN3ZRHoqntB+FymaBfQ3/ -yfKkDNfnMua5GzLyyYGYUDDx71rtfrs3hGDiwjvE4B0IvsU0E7Oerk5gLqx8t0q/ -MmhI+CJJS1bH2sRBMcqfRAv+eyByFsvLY7Er/ztveaabX9xEwyPNFOcU+SZMhipv -EUKmUcOAHxzx4HbYEFyM0Z7WgUdlTd1xAgMBAAGjZjBkMB8GA1UdIwQYMBaAFPUI -BlLFno+y5xdHlCX349iVyS75MB0GA1UdDgQWBBQzVhTSCf8F31Zf0Bu661qymMko -JzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0B -AQsFAAOCAgEADQEufjma/6fT/Do4Fh13lZhsowHSsGv5sFYly6224GsciE80ZwYg -R4EK/TAR0jorBXsu6sQc51pZ5SSHhIxfo2frfprTPaaWN6cZwfrb6UcnD/FaZ1jP -HzWrI3kRxG9JCDffzE8uMf8Rnc69n1j+TBerk4Ix3Zui2TaaF6LVceJ4RgeNkZl0 -OFkGGFruHz/d83q7A6YjgN0iwMEabdtKH7Sq27LqGPeCS8NuGlrziNAxktdwaYlN -D5t6ntM/1nHYPmVqdioEU9vAnyB3BiXOlITPHEEMOSlItcUsJ6rN5DZJaJgkBxvN -Qdi6wmaDlxy8XFyy4KGFKWAl17FlfpqW5VtYQJ4aDpibGlGqamg0vm+IJDIGPlOs -KQcxG17cOw4MCflAtnzHKHBn52DegQKwxev2ZpqdwVw/NqPq0yTNEbCRqEyiq7+H -ljKEFiEjEjeXTcqR4DoCseA5UgcriuriV0OCvr8KTlviV4FEUu+IA9ut8YIvf2of -Zz0z8rO4H+Rb4tMi/yBRM09x3rEW4hXwO0qpCBNBa0wEJBxufF3f6l9efEle+YTR -XS92gutaoVluqMfRSJckjwWokToi32/FvF79guZymD0qHkOSi5dewsIW7zsdobvv -t2CWLfTAb9cx222ELBpVPkfcgUKfF4RCGWPzuAlK6OueuDrInOiz8ag= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFUjCCAzqgAwIBAgICBpAwDQYJKoZIhvcNAQELBQAwODELMAkGA1UEBhMCSlAx -FzAVBgNVBAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMB4XDTE5 -MDcxNjEwNTkwMVoXDTM5MDcxNTEwNTkwMVowODELMAkGA1UEBhMCSlAxFzAVBgNV -BAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAqiPMbNudotG8afkk5Fwo2QdDcFFmC+qGpGjw -yQs57QtGPRk1HsIhZFfr6zn8t1tZw6Zo+A0biFA7d2N93nYsseHBy/bZlhhOL+Js -Jb907UM09L5xaJIgnbFYVT1QjtB7ksLAy3rHpdSKiggfT1ynwM/u6wIdWRSx24QU -Vxpq5iFpVj041+/RnpCPASL5pSnbYZKQyOb/XsOaR+hz7aSjwiUzk2cRjAmRqYxY -qYVe135IAy377inJRtUPvi3IhtmUHJToiMLBH5tChkjkIpdRG1lVIj4vGdzrIb+Q -Kvg/k7BDVZ3sstsLvJ8evNonBzrqcr80ek/X+HFrgY/3M1VEru4ohLAiA877CuuG -UAfrxFh9qjP1yue+dlrQWk+WHMbGMzKI1zCKEMphJatyNHfpRtD8LUWtLV96DD78 -qLwQwrSYrEMd2u/akeBFKINYWqpqkVBhSsV3eukXVIdSbtSAxZNv+4m6QddEcUvG -2ZLf+yCf2tl+LPGXNL08vwMVbQqcDw8m+nDP4vu0VUixddyoqnnDlWOoQESuQFQ1 -IqYFQhRPs2dFRf5TJzkmbqRUXbaPxsrKGjTtVpPgENbv40nyRGyBbl1CzqpBFEp5 -7w4MPYDIzWKYbRyCnUE5WScRBFmym7242KA3SOfkylzGMb8KGJxohVME+7oMbNf5 -EjLWVgECAwEAAaNmMGQwHwYDVR0jBBgwFoAU9QgGUsWej7LnF0eUJffj2JXJLvkw -HQYDVR0OBBYEFPUIBlLFno+y5xdHlCX349iVyS75MA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCDGIeYrtivFt3p -8k5vXKFUT072C7wMvfrAGYCYgIdUthWCqJoMwnG3Fsg7Ngu70La7ESBzEKpnpPWz -eIdnREJkNP9iqiKHXnaUV2P/21AS1q6enVKBFOl7dYiVjqOZ+vac3a1UjLWkvm0g -x4sg/f3PpiEzZM7ecnQYk2wfMSq8Jw0w1Lf0SEeoYZTkf12cqSJVSa/G7gEdL/Cn -LO3yyBq0KPNdd87eIfvCLJj55UJ5dCr0JXRTUteBvJwflbPXmOqfI8fA05fwlJZS -o1SBpMI9cEBwaPXQM9CPNKaWLvyOR1KpviRzbCnaKf44Fs2OuZboo3avZrC9eUoU -HU2HKXRj8UMRlFeCdNugbOdGyK+CpXwMHVtIrtpf0iOUqo0rOekgnUSNi9qyjD1g -IV3Y/NLVl9fqe8q66IWUn8NYndxigMKWcMCBFUjfP0yMZeqSHFiIv7zk9PuV/62k -Yele7cK9iHnEUwWBj6VCEs6pZBS1QSmhRw3GWlSDc/gHXd38PG20zH7xg4z2H9Rc -Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc -Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ -HInwg85pGm+sEkYbYFRBD0woPBsL3g== ------END CERTIFICATE----- diff --git a/location/ripcurrentpro/user/gps.xml b/location/ripcurrentpro/user/gps.xml deleted file mode 100644 index 6c335c52..00000000 --- a/location/ripcurrentpro/user/gps.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - diff --git a/location/ripcurrentpro/user/lhd.conf b/location/ripcurrentpro/user/lhd.conf deleted file mode 100644 index 73e03bcc..00000000 --- a/location/ripcurrentpro/user/lhd.conf +++ /dev/null @@ -1,31 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.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/location/ripcurrentpro/user/scd.conf b/location/ripcurrentpro/user/scd.conf deleted file mode 100644 index e75f209b..00000000 --- a/location/ripcurrentpro/user/scd.conf +++ /dev/null @@ -1,5 +0,0 @@ -LogEnabled=false -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 diff --git a/location/ripcurrentpro/userdebug/gps.xml b/location/ripcurrentpro/userdebug/gps.xml deleted file mode 100644 index 0686861c..00000000 --- a/location/ripcurrentpro/userdebug/gps.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - diff --git a/location/ripcurrentpro/userdebug/lhd.conf b/location/ripcurrentpro/userdebug/lhd.conf deleted file mode 100644 index c430b93a..00000000 --- a/location/ripcurrentpro/userdebug/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/ripcurrentpro/userdebug/scd.conf b/location/ripcurrentpro/userdebug/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/ripcurrentpro/userdebug/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/tokay/Android.bp b/location/tokay/Android.bp index eadab4e5..eedc1fb8 100644 --- a/location/tokay/Android.bp +++ b/location/tokay/Android.bp @@ -5,7 +5,7 @@ package { } soong_config_module_type { - name: "ignss_prebuilt_etc", + name: "gnss_prebuilt_etc", module_type: "prebuilt_etc", config_namespace: "gpssdk", variables: [ @@ -25,7 +25,7 @@ soong_config_string_variable { ], } -ignss_prebuilt_etc { +gnss_prebuilt_etc { name: "gps.cfg", soong_config_variables: { buildtype: { @@ -46,107 +46,3 @@ ignss_prebuilt_etc { relative_install_path: "gnss", vendor: true, } - -soong_config_module_type { - name: "egnss_prebuilt_etc", - module_type: "prebuilt_etc", - config_namespace: "gpssdk", - variables: [ - "gpsconf", - ], - properties: [ - "src", - ], -} - -soong_config_string_variable { - name: "gpsconf", - values: [ - "factory", - "user", - "userdebug", - "eng", - ], -} - -prebuilt_etc { - name: "gps.cer", - src: "gps.cer", - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "gps.xml", - soong_config_variables: { - gpsconf: { - user: { - src: "user/gps.xml", - }, - userdebug: { - src: "userdebug/gps.xml", - }, - eng: { - src: "userdebug/gps.xml", - }, - factory: { - src: "factory/gps.xml", - }, - conditions_default: { - src: "user/gps.xml", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "lhd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/lhd.conf", - }, - userdebug: { - src: "userdebug/lhd.conf", - }, - eng: { - src: "userdebug/lhd.conf", - }, - factory: { - src: "factory/lhd.conf", - }, - conditions_default: { - src: "user/lhd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "scd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/scd.conf", - }, - userdebug: { - src: "userdebug/scd.conf", - }, - eng: { - src: "userdebug/scd.conf", - }, - factory: { - src: "factory/scd.conf", - }, - conditions_default: { - src: "user/scd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} diff --git a/location/tokay/factory/gps.xml b/location/tokay/factory/gps.xml deleted file mode 100644 index 89558834..00000000 --- a/location/tokay/factory/gps.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - diff --git a/location/tokay/factory/lhd.conf b/location/tokay/factory/lhd.conf deleted file mode 100644 index c430b93a..00000000 --- a/location/tokay/factory/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/tokay/factory/scd.conf b/location/tokay/factory/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/tokay/factory/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/tokay/gps.cer b/location/tokay/gps.cer deleted file mode 100644 index 934e0c5c..00000000 --- a/location/tokay/gps.cer +++ /dev/null @@ -1,161 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ -RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD -VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX -DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y -ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy -VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr -mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr -IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK -mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu -XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy -dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye -jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 -BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 -DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 -9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx -jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 -Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz -ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS -R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH -MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI -2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx -1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ -q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz -tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ -vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP -BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV -5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY -1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 -NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG -Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 -8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe -pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl -MrY= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFZTCCA02gAwIBAgIPAWv6o5fPZQ5hxva1vuNrMA0GCSqGSIb3DQEBCwUAMDgx -CzAJBgNVBAYTAkpQMRcwFQYDVQQKDA5SYWt1dGVuIE1vYmlsZTEQMA4GA1UEAwwH -Um9vdCBDQTAeFw0xOTA3MTYxMTU1NDJaFw0yOTA3MTMxMTU1NDJaMD4xCzAJBgNV -BAYTAkpQMRcwFQYDVQQKEw5SYWt1dGVuIE1vYmlsZTEWMBQGA1UEAxMNREMgSXNz -dWluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAObjAbQ8TkzF -A+/WvSE6fzDf+rlvBKY1dJJbiJ2/j0lc+tj56dE7+BhZ2JVmAYIYfEoUw69dwxTR -44EdZln3ZVFmMuOdfxvF9A46pMKzH1skr8ErDgjNyJ9f/JOuQ29p/7BvLC55aRzk -yj99BYdzJWKs+5W7jQlv7/HyJ/PQ+rUEBOx4o/YiTucDFduWdV6/x5mcEbKD3ufL -66vUEf3MHGegDkOWAMTchl1RmaYDlf3IMsXC7M2bFPFa/9y/vzaaY6EhnJ861co6 -rkOhTZe/kJZwqQYFmWczBPZK/9zRy3C1zA09tCBk+CDNBrNXe+3dMLFmnW4npxUQ -oceTPhaaDo5lA6HkkARwVWLrporFZ2B/th2Bqtu6uObLSB6JMA2jxmKwKukM8/jp -C9tKV9X03rHQIQultc63rivPdgQvqYgW1PVdzV1a3pZEMk5zv257+fxgfUGzfUh7 -tx0OY+BkykSP6ZK/BsbI/BY+rsS0L/0lmC22NU1p+qVeN3ZRHoqntB+FymaBfQ3/ -yfKkDNfnMua5GzLyyYGYUDDx71rtfrs3hGDiwjvE4B0IvsU0E7Oerk5gLqx8t0q/ -MmhI+CJJS1bH2sRBMcqfRAv+eyByFsvLY7Er/ztveaabX9xEwyPNFOcU+SZMhipv -EUKmUcOAHxzx4HbYEFyM0Z7WgUdlTd1xAgMBAAGjZjBkMB8GA1UdIwQYMBaAFPUI -BlLFno+y5xdHlCX349iVyS75MB0GA1UdDgQWBBQzVhTSCf8F31Zf0Bu661qymMko -JzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0B -AQsFAAOCAgEADQEufjma/6fT/Do4Fh13lZhsowHSsGv5sFYly6224GsciE80ZwYg -R4EK/TAR0jorBXsu6sQc51pZ5SSHhIxfo2frfprTPaaWN6cZwfrb6UcnD/FaZ1jP -HzWrI3kRxG9JCDffzE8uMf8Rnc69n1j+TBerk4Ix3Zui2TaaF6LVceJ4RgeNkZl0 -OFkGGFruHz/d83q7A6YjgN0iwMEabdtKH7Sq27LqGPeCS8NuGlrziNAxktdwaYlN -D5t6ntM/1nHYPmVqdioEU9vAnyB3BiXOlITPHEEMOSlItcUsJ6rN5DZJaJgkBxvN -Qdi6wmaDlxy8XFyy4KGFKWAl17FlfpqW5VtYQJ4aDpibGlGqamg0vm+IJDIGPlOs -KQcxG17cOw4MCflAtnzHKHBn52DegQKwxev2ZpqdwVw/NqPq0yTNEbCRqEyiq7+H -ljKEFiEjEjeXTcqR4DoCseA5UgcriuriV0OCvr8KTlviV4FEUu+IA9ut8YIvf2of -Zz0z8rO4H+Rb4tMi/yBRM09x3rEW4hXwO0qpCBNBa0wEJBxufF3f6l9efEle+YTR -XS92gutaoVluqMfRSJckjwWokToi32/FvF79guZymD0qHkOSi5dewsIW7zsdobvv -t2CWLfTAb9cx222ELBpVPkfcgUKfF4RCGWPzuAlK6OueuDrInOiz8ag= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFUjCCAzqgAwIBAgICBpAwDQYJKoZIhvcNAQELBQAwODELMAkGA1UEBhMCSlAx -FzAVBgNVBAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMB4XDTE5 -MDcxNjEwNTkwMVoXDTM5MDcxNTEwNTkwMVowODELMAkGA1UEBhMCSlAxFzAVBgNV -BAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAqiPMbNudotG8afkk5Fwo2QdDcFFmC+qGpGjw -yQs57QtGPRk1HsIhZFfr6zn8t1tZw6Zo+A0biFA7d2N93nYsseHBy/bZlhhOL+Js -Jb907UM09L5xaJIgnbFYVT1QjtB7ksLAy3rHpdSKiggfT1ynwM/u6wIdWRSx24QU -Vxpq5iFpVj041+/RnpCPASL5pSnbYZKQyOb/XsOaR+hz7aSjwiUzk2cRjAmRqYxY -qYVe135IAy377inJRtUPvi3IhtmUHJToiMLBH5tChkjkIpdRG1lVIj4vGdzrIb+Q -Kvg/k7BDVZ3sstsLvJ8evNonBzrqcr80ek/X+HFrgY/3M1VEru4ohLAiA877CuuG -UAfrxFh9qjP1yue+dlrQWk+WHMbGMzKI1zCKEMphJatyNHfpRtD8LUWtLV96DD78 -qLwQwrSYrEMd2u/akeBFKINYWqpqkVBhSsV3eukXVIdSbtSAxZNv+4m6QddEcUvG -2ZLf+yCf2tl+LPGXNL08vwMVbQqcDw8m+nDP4vu0VUixddyoqnnDlWOoQESuQFQ1 -IqYFQhRPs2dFRf5TJzkmbqRUXbaPxsrKGjTtVpPgENbv40nyRGyBbl1CzqpBFEp5 -7w4MPYDIzWKYbRyCnUE5WScRBFmym7242KA3SOfkylzGMb8KGJxohVME+7oMbNf5 -EjLWVgECAwEAAaNmMGQwHwYDVR0jBBgwFoAU9QgGUsWej7LnF0eUJffj2JXJLvkw -HQYDVR0OBBYEFPUIBlLFno+y5xdHlCX349iVyS75MA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCDGIeYrtivFt3p -8k5vXKFUT072C7wMvfrAGYCYgIdUthWCqJoMwnG3Fsg7Ngu70La7ESBzEKpnpPWz -eIdnREJkNP9iqiKHXnaUV2P/21AS1q6enVKBFOl7dYiVjqOZ+vac3a1UjLWkvm0g -x4sg/f3PpiEzZM7ecnQYk2wfMSq8Jw0w1Lf0SEeoYZTkf12cqSJVSa/G7gEdL/Cn -LO3yyBq0KPNdd87eIfvCLJj55UJ5dCr0JXRTUteBvJwflbPXmOqfI8fA05fwlJZS -o1SBpMI9cEBwaPXQM9CPNKaWLvyOR1KpviRzbCnaKf44Fs2OuZboo3avZrC9eUoU -HU2HKXRj8UMRlFeCdNugbOdGyK+CpXwMHVtIrtpf0iOUqo0rOekgnUSNi9qyjD1g -IV3Y/NLVl9fqe8q66IWUn8NYndxigMKWcMCBFUjfP0yMZeqSHFiIv7zk9PuV/62k -Yele7cK9iHnEUwWBj6VCEs6pZBS1QSmhRw3GWlSDc/gHXd38PG20zH7xg4z2H9Rc -Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc -Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ -HInwg85pGm+sEkYbYFRBD0woPBsL3g== ------END CERTIFICATE----- diff --git a/location/tokay/user/gps.xml b/location/tokay/user/gps.xml deleted file mode 100644 index 6c335c52..00000000 --- a/location/tokay/user/gps.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - diff --git a/location/tokay/user/lhd.conf b/location/tokay/user/lhd.conf deleted file mode 100644 index 73e03bcc..00000000 --- a/location/tokay/user/lhd.conf +++ /dev/null @@ -1,31 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.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/location/tokay/user/scd.conf b/location/tokay/user/scd.conf deleted file mode 100644 index e75f209b..00000000 --- a/location/tokay/user/scd.conf +++ /dev/null @@ -1,5 +0,0 @@ -LogEnabled=false -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 diff --git a/location/tokay/userdebug/gps.xml b/location/tokay/userdebug/gps.xml deleted file mode 100644 index 0686861c..00000000 --- a/location/tokay/userdebug/gps.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - diff --git a/location/tokay/userdebug/lhd.conf b/location/tokay/userdebug/lhd.conf deleted file mode 100644 index c430b93a..00000000 --- a/location/tokay/userdebug/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/tokay/userdebug/scd.conf b/location/tokay/userdebug/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/tokay/userdebug/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf From 54120ae2ec631f6359a430ff86add57b57c31e96 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 4 Jun 2024 03:11:29 +0000 Subject: [PATCH 4/9] audio: update wave tuning for FRC - KM4_freshmango_v4_Rev15C_LLv3_smooth2.mps Bug: 343310595 Test: manual test from hardware Change-Id: Ifd3068db61e4bf5c5983a335940469f46d24f4a5 Signed-off-by: Jasmine Cha --- audio/komodo/tuning/waves/waves_preset.mps | Bin 199394 -> 206884 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/komodo/tuning/waves/waves_preset.mps b/audio/komodo/tuning/waves/waves_preset.mps index e17838d8d5c41688f5024172531ff8238ea9038f..7b96de09853f27f74d9e8e985749ee410d0105cb 100644 GIT binary patch delta 13216 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 MMX`jW&$l!C?{!viY5)KL From 7c3a161670e18866c15cc3d1a09146a18bc48293 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Wed, 5 Jun 2024 20:11:39 +0000 Subject: [PATCH 5/9] Override config_useDeadZone on caimito devices Bug: 324611410 Change-Id: Iacb3b4cb74106e3b3eecd1c7adb7de8e48a852aa Test: Tested on komodo --- .../frameworks/base/packages/SystemUI/res/values/config.xml | 3 +++ .../frameworks/base/packages/SystemUI/res/values/config.xml | 3 +++ .../frameworks/base/packages/SystemUI/res/values/config.xml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index bd5eb09e..116b0df5 100644 --- a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -73,4 +73,7 @@ false + + + false diff --git a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index 8d5d2460..7b3e4c74 100644 --- a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -73,4 +73,7 @@ false + + + false diff --git a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index dbc18d0f..6564d57a 100644 --- a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -73,4 +73,7 @@ false + + + false From 7a1d729d40057d9bc22b316030fc81b2e48021e7 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Wed, 29 May 2024 01:33:17 +0000 Subject: [PATCH 6/9] audio: waves: use SPEAKER_MUSIC in call screen Presets in call screen: Before: - SPEAKER_SAFE_MUSIC_LITE - SPEAKER_SAFE_MUSIC_THROTTLE_LITE After: - SPEAKER_MUSIC - SPEAKER_MUSIC_THROTTLE - SPEAKER_MUSIC_RESERVED (spatial audio) - SPEAKER_MUSIC_RESERVED_THROTTLE (spatial audio) - SPEAKER_SAFE_MUSIC - SPEAKER_SAFE_MUSIC_THROTTLE Bug: 341930605 Test: manual test b/341930605#comment16 Change-Id: Iadf5f0835789e0afe0a4ae0143d9df60dab8b81a Signed-off-by: Jasmine Cha --- audio/caiman/tuning/waves/waves_config.ini | 18 +++++++++--------- audio/komodo/tuning/waves/waves_config.ini | 18 +++++++++--------- audio/tokay/tuning/waves/waves_config.ini | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/audio/caiman/tuning/waves/waves_config.ini b/audio/caiman/tuning/waves/waves_config.ini index b5acfb80..3b44df61 100644 --- a/audio/caiman/tuning/waves/waves_config.ini +++ b/audio/caiman/tuning/waves/waves_config.ini @@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatIncrement=8 [CUSTOM_ACTION_260] -CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE -CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC -CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE -CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE -CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE -CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED -CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE +CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE +CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE +CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED +CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE # Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t # - audio_devices_t : current active device -# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip +# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed # - sound_usage_t: 0 - Music, 1 - Movie \ No newline at end of file diff --git a/audio/komodo/tuning/waves/waves_config.ini b/audio/komodo/tuning/waves/waves_config.ini index b5acfb80..3b44df61 100644 --- a/audio/komodo/tuning/waves/waves_config.ini +++ b/audio/komodo/tuning/waves/waves_config.ini @@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatIncrement=8 [CUSTOM_ACTION_260] -CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE -CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC -CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE -CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE -CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE -CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED -CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE +CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE +CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE +CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED +CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE # Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t # - audio_devices_t : current active device -# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip +# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed # - sound_usage_t: 0 - Music, 1 - Movie \ No newline at end of file diff --git a/audio/tokay/tuning/waves/waves_config.ini b/audio/tokay/tuning/waves/waves_config.ini index b5acfb80..3b44df61 100644 --- a/audio/tokay/tuning/waves/waves_config.ini +++ b/audio/tokay/tuning/waves/waves_config.ini @@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatIncrement=8 [CUSTOM_ACTION_260] -CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE -CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC -CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE -CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE -CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE -CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED -CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE +CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE +CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE +CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED +CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE # Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t # - audio_devices_t : current active device -# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip +# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed # - sound_usage_t: 0 - Music, 1 - Movie \ No newline at end of file From dc212069dc0b78cc9193d261970dc7539519e9e3 Mon Sep 17 00:00:00 2001 From: James Huang Date: Mon, 10 Jun 2024 22:14:18 +0800 Subject: [PATCH 7/9] gps: Update official release 4.15.1_15_240610_R2 config for P24 Add allow_logging_if_disconnected=0 Bug: 344006818 Test: CTS/VTS, Sanity test/Stress Test/SST Change-Id: Ifd803e0fe605440ccb7814211af686557f847c36 --- location/caiman/user/gps.cfg | 1 + location/caiman/userdebug/gps.cfg | 2 ++ location/komodo/user/gps.cfg | 1 + location/komodo/userdebug/gps.cfg | 2 ++ location/ripcurrent24/user/gps.cfg | 1 + location/ripcurrent24/userdebug/gps.cfg | 2 ++ location/ripcurrentpro/user/gps.cfg | 1 + location/ripcurrentpro/userdebug/gps.cfg | 2 ++ location/tokay/user/gps.cfg | 1 + location/tokay/userdebug/gps.cfg | 2 ++ 10 files changed, 15 insertions(+) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index 826af06d..e8713a6c 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -7,6 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1 gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK Is1PPSTimeSyncEnable=0 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index 3201d73f..b0dd58cc 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -20,6 +20,8 @@ gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 + # enable ism stream for GAAM ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index d0b01713..3462a024 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -7,6 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1 gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK Is1PPSTimeSyncEnable=0 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index 283b3ae7..25c6cc2a 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -20,6 +20,8 @@ gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 + # enable ism stream for GAAM ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index a37b6c6e..c28dcc9e 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -7,6 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1 gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK Is1PPSTimeSyncEnable=0 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 92d144fc..ceced4e9 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -20,6 +20,8 @@ gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 + # enable ism stream for GAAM ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index a37b6c6e..c28dcc9e 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -7,6 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1 gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK Is1PPSTimeSyncEnable=0 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 92d144fc..ceced4e9 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -20,6 +20,8 @@ gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 + # enable ism stream for GAAM ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 30286833..1ab34a5e 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -7,6 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1 gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK Is1PPSTimeSyncEnable=0 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 43f84076..03281fb3 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -20,6 +20,8 @@ gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 + # enable ism stream for GAAM ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK From b9b54aa493fac69701593db96fa6bae2d0fc342f Mon Sep 17 00:00:00 2001 From: Kiwon Park Date: Wed, 29 May 2024 11:44:26 -0700 Subject: [PATCH 8/9] Enable bootstrap if warranty sku is set Test: manual Bug: 336903409 Change-Id: I3f3f96516a2774e54dcbfa4470cbe1c98e46df7e --- conf/init.caiman.rc | 4 ++++ conf/init.komodo.rc | 4 ++++ conf/init.tokay.rc | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc index c63cfa7d..cc70e3ec 100644 --- a/conf/init.caiman.rc +++ b/conf/init.caiman.rc @@ -79,3 +79,7 @@ on property:sys.boot_completed=1 # it should be written by the system init. on property:ro.boot.hardware.sku=GWVK6 setprop audio.camerasound.force true + +# Enable bootstrap when warrarnty is set +on boot && property:ro.boot.warranty.sku=* + setprop setupwizard.feature.provisioning_profile_mode true \ No newline at end of file diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc index 51d7027f..ca74c2b8 100644 --- a/conf/init.komodo.rc +++ b/conf/init.komodo.rc @@ -83,3 +83,7 @@ on property:sys.boot_completed=1 # it should be written by the system init. on property:ro.boot.hardware.sku=GQ57S setprop audio.camerasound.force true + +# Enable bootstrap when warrarnty is set +on boot && property:ro.boot.warranty.sku=* + setprop setupwizard.feature.provisioning_profile_mode true diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc index f0626726..b1aeeb19 100644 --- a/conf/init.tokay.rc +++ b/conf/init.tokay.rc @@ -81,3 +81,7 @@ on fs # it should be written by the system init. on property:ro.boot.hardware.sku=G1B60 setprop audio.camerasound.force true + +# Enable bootstrap when warrarnty is set +on boot && property:ro.boot.warranty.sku=* + setprop setupwizard.feature.provisioning_profile_mode true \ No newline at end of file From b42a8257127c912fc6a8c6b5bfe54b262a9b19b6 Mon Sep 17 00:00:00 2001 From: Hsiu-Chang Chen Date: Tue, 11 Jun 2024 15:34:33 +0800 Subject: [PATCH 9/9] wifi: Enable WIFI_BRCM_OPEN_SOURCE_MULTI_AKM Bug: 345118973 Test: Build pass Change-Id: Ia21cddc1be9a9c645a9202aaf3f035a1ddadcdaa --- wifi/BoardConfig-wifi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 1ef4ef10..4a66d1c0 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -31,6 +31,7 @@ WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true +WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled PRODUCT_COPY_FILES += \ device/google/caimito/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \