MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Legacy targets to GNSS HIDL 2.0

Browse source 
Legacy targets will support a subset of
GNSS HIDL 2.0 features, but will need to
stay on GNSS 1.0 Measurements

CRs-fixed: 2423825
Change-Id: I1fc5134dbf4b8fc6b1e76cced3acfeaf8bf8d581
This commit is contained in:
Dante Russo 2019-03-20 13:53:08 -07:00
parent de7fa11dd6
commit 4b9768f091
3 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/2.0/Android.mk
View file

@ -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 \

8
android/2.0/Gnss.cpp
View file

@ -407,9 +407,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() {
@ -470,9 +474,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() {

38
build/target_specific_features.mk
View file

@ -28,18 +28,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
@ -47,7 +47,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