Enable building and sanitizer for Gnss Hidl 2.1
Change-Id: I46738deb8f8574c666cb2c7941cce2a38bec9c0b
CRs-fixed: 2692453
diff --git a/Android.mk b/Android.mk
index 2b0b9e5..5c936ae 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,7 @@
-Wno-error=switch \
-Wno-error=date-time
-GNSS_HIDL_VERSION = 2.0
+GNSS_HIDL_VERSION = 2.1
GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += msm8937
GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += msm8953
diff --git a/android/2.1/Android.mk b/android/2.1/Android.mk
index 4601f7e..a947e41 100644
--- a/android/2.1/Android.mk
+++ b/android/2.1/Android.mk
@@ -2,6 +2,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.gnss@2.1-impl-qti
+LOCAL_SANITIZE += $(GNSS_SANITIZE)
+# activate the following line for debug purposes only, comment out for production
+#LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG)
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
@@ -71,6 +74,9 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.gnss@2.1-service-qti
+LOCAL_SANITIZE += $(GNSS_SANITIZE)
+# activate the following line for debug purposes only, comment out for production
+#LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG)
LOCAL_VINTF_FRAGMENTS := android.hardware.gnss@2.1-service-qti.xml
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
diff --git a/gps_vendor_product.mk b/gps_vendor_product.mk
index ab11e96..e7d4cbf 100644
--- a/gps_vendor_product.mk
+++ b/gps_vendor_product.mk
@@ -34,8 +34,8 @@
PRODUCT_PACKAGES += libloc_core
PRODUCT_PACKAGES += libgnss
-PRODUCT_PACKAGES += android.hardware.gnss@2.0-impl-qti
-PRODUCT_PACKAGES += android.hardware.gnss@2.0-service-qti
+PRODUCT_PACKAGES += android.hardware.gnss@2.1-impl-qti
+PRODUCT_PACKAGES += android.hardware.gnss@2.1-service-qti
endif # ifneq (,$(filter $(LOC_BOARD_PLATFORM_LIST),$(TARGET_BOARD_PLATFORM)))
endif # ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)