Use GNSS HAL v2.1 in Cuttlefish
Bug: 136136192
Bug: 141758837
Test: atest VtsHalGnssV2_1TargetTest
Change-Id: I00faf5d1613f2f1630d9128b929b0246cd59f282
diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index 24b45cd..f16cd72 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -65,10 +65,6 @@
# DRM HAL
PRODUCT_PACKAGES += android.hardware.drm@1.2-service.clearkey
-# GPS HAL
-PRODUCT_PACKAGES += \
- android.hardware.gnss@2.0-service
-
# CAN bus HAL
PRODUCT_PACKAGES += android.hardware.automotive.can@1.0-service
PRODUCT_PACKAGES_DEBUG += canhalctrl \
diff --git a/shared/config/CleanSpec.mk b/shared/config/CleanSpec.mk
index 8ead76d..aa0d77d 100644
--- a/shared/config/CleanSpec.mk
+++ b/shared/config/CleanSpec.mk
@@ -46,3 +46,4 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.gnss@1.0-service)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.drm@1.2-service.clearkey)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.drm@1.2-service.widevine)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.gnss@2.0-service)
diff --git a/shared/device.mk b/shared/device.mk
index 6ccbcba..49779db 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -266,7 +266,7 @@
# GPS
#
PRODUCT_PACKAGES += \
- android.hardware.gnss@2.0-service
+ android.hardware.gnss@2.1-service
# Health
PRODUCT_PACKAGES += \
