Merge "Move Legacy targets to GNSS HIDL 2.0"

3 files changed, 38 insertions, 13 deletions

diff --git a/android/2.0/Android.mk b/android/2.0/Android.mk
index 244bd9c..2000bb8 100644
--- a/android/2.0/Android.mk
+++ b/android/2.0/Android.mk
@@ -24,6 +24,11 @@ LOCAL_SRC_FILES += \
     location_api/BatchingAPIClient.cpp \
     location_api/LocationUtil.cpp \
 
+ifeq ($(GNSS_HIDL_LEGACY_MEASURMENTS),true)
+LOCAL_CFLAGS += \
+     -DGNSS_HIDL_LEGACY_MEASURMENTS
+endif
+
 LOCAL_C_INCLUDES:= \
     $(LOCAL_PATH)/location_api \
     $(LOCAL_PATH)/../measurement_corrections/1.0 \
diff --git a/android/2.0/Gnss.cpp b/android/2.0/Gnss.cpp
index 4033147..cd88649 100644
--- a/android/2.0/Gnss.cpp
+++ b/android/2.0/Gnss.cpp
@@ -413,9 +413,13 @@ Return<bool> Gnss::setPositionMode_1_1(V1_0::IGnss::GnssPositionMode mode,
 
 Return<sp<V1_1::IGnssMeasurement>> Gnss::getExtensionGnssMeasurement_1_1() {
     ENTRY_LOG_CALLFLOW();
+#ifdef GNSS_HIDL_LEGACY_MEASURMENTS
+    return nullptr;
+#else
     if (mGnssMeasurement == nullptr)
         mGnssMeasurement = new GnssMeasurement();
     return mGnssMeasurement;
+#endif
 }
 
 Return<sp<V1_1::IGnssConfiguration>> Gnss::getExtensionGnssConfiguration_1_1() {
@@ -476,9 +480,13 @@ Return<sp<V2_0::IGnssConfiguration>> Gnss::getExtensionGnssConfiguration_2_0() {
 }
 Return<sp<V2_0::IGnssMeasurement>> Gnss::getExtensionGnssMeasurement_2_0() {
     ENTRY_LOG_CALLFLOW();
+#ifdef GNSS_HIDL_LEGACY_MEASURMENTS
+    return nullptr;
+#else
     if (mGnssMeasurement == nullptr)
         mGnssMeasurement = new GnssMeasurement();
     return mGnssMeasurement;
+#endif
 }
 Return<sp<::android::hardware::gnss::measurement_corrections::V1_0::IMeasurementCorrections>>
         Gnss::getExtensionMeasurementCorrections() {
diff --git a/build/target_specific_features.mk b/build/target_specific_features.mk
index 76126c8..2e74aff 100644
--- a/build/target_specific_features.mk
+++ b/build/target_specific_features.mk
@@ -30,18 +30,18 @@ GNSS_HIDL_1_0_TARGET_LIST += msm8909
 GNSS_HIDL_1_0_TARGET_LIST += msm8952
 GNSS_HIDL_1_0_TARGET_LIST += msm8992
 GNSS_HIDL_1_0_TARGET_LIST += msm8996
-GNSS_HIDL_1_0_TARGET_LIST += msm8937
-GNSS_HIDL_1_0_TARGET_LIST += msm8953
-GNSS_HIDL_1_0_TARGET_LIST += msm8998
-GNSS_HIDL_1_0_TARGET_LIST += apq8098_latv
-GNSS_HIDL_1_0_TARGET_LIST += sdm710
-GNSS_HIDL_1_0_TARGET_LIST += qcs605
-GNSS_HIDL_1_0_TARGET_LIST += sdm845
-GNSS_HIDL_1_0_TARGET_LIST += sdm660
-GNSS_HIDL_2_0_TARGET_LIST := msmnile
-GNSS_HIDL_1_1_TARGET_LIST += $(MSMSTEPPE)
-GNSS_HIDL_1_1_TARGET_LIST += $(TRINKET)
-GNSS_HIDL_1_1_TARGET_LIST += kona
+GNSS_HIDL_2_0_TARGET_LIST := msm8937
+GNSS_HIDL_2_0_TARGET_LIST += msm8953
+GNSS_HIDL_2_0_TARGET_LIST += msm8998
+GNSS_HIDL_2_0_TARGET_LIST += apq8098_latv
+GNSS_HIDL_2_0_TARGET_LIST += sdm710
+GNSS_HIDL_2_0_TARGET_LIST += qcs605
+GNSS_HIDL_2_0_TARGET_LIST += sdm845
+GNSS_HIDL_2_0_TARGET_LIST += sdm660
+GNSS_HIDL_2_0_TARGET_LIST += msmnile
+GNSS_HIDL_2_0_TARGET_LIST += $(MSMSTEPPE)
+GNSS_HIDL_2_0_TARGET_LIST += $(TRINKET)
+GNSS_HIDL_2_0_TARGET_LIST += kona
 
 ifneq (,$(filter $(GNSS_HIDL_2_0_TARGET_LIST),$(TARGET_BOARD_PLATFORM)))
 GNSS_HIDL_VERSION = 2.0
@@ -49,7 +49,19 @@ endif
 ifneq (,$(filter $(GNSS_HIDL_1_0_TARGET_LIST),$(TARGET_BOARD_PLATFORM)))
 GNSS_HIDL_VERSION = 1.0
 endif
-
 ifneq (,$(filter $(GNSS_HIDL_1_1_TARGET_LIST),$(TARGET_BOARD_PLATFORM)))
 GNSS_HIDL_VERSION = 1.1
 endif
+
+GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST := msm8937
+GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += msm8953
+GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += msm8998
+GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += apq8098_latv
+GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += sdm710
+GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += qcs605
+GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += sdm845
+GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += sdm660
+
+ifneq (,$(filter $(GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST),$(TARGET_BOARD_PLATFORM)))
+GNSS_HIDL_LEGACY_MEASURMENTS = true
+endif