diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-20 08:15:52 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-20 08:15:52 +0000 |
commit | 4e261b0f290b15600a20906f0e4a881e4a9e857a (patch) | |
tree | 2a9c33c5cc076e455cdce3eb3d71209339f28d3f | |
parent | decf9059939f48caa600c4747de3806cee6f58dd (diff) | |
parent | 9fd72cb68af746dcb2c6b711c20c6216286c89c4 (diff) | |
download | gps-4e261b0f290b15600a20906f0e4a881e4a9e857a.tar.gz |
release-request-95cbb47d-b12d-4748-8934-a5ed56cbe040-for-git_oc-dr1-release-4116076 snap-temp-L12600000075746614
Change-Id: Ifc94d64aa3406500de18187156d83fe01f598d23
-rw-r--r-- | msm8998/android/Android.mk | 3 | ||||
-rw-r--r-- | msm8998/android/location_api/GnssAPIClient.cpp | 7 | ||||
-rw-r--r-- | msm8998/core/Android.mk | 3 | ||||
-rw-r--r-- | msm8998/gnss/Android.mk | 3 | ||||
-rw-r--r-- | msm8998/location/Android.mk | 3 | ||||
-rw-r--r-- | msm8998/utils/Android.mk | 3 | ||||
-rw-r--r-- | msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk | 3 | ||||
-rw-r--r-- | msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk | 3 |
8 files changed, 10 insertions, 18 deletions
diff --git a/msm8998/android/Android.mk b/msm8998/android/Android.mk index 849fb95..57a0b51 100644 --- a/msm8998/android/Android.mk +++ b/msm8998/android/Android.mk @@ -2,8 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.0-impl-qti -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_OWNER := qti LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ diff --git a/msm8998/android/location_api/GnssAPIClient.cpp b/msm8998/android/location_api/GnssAPIClient.cpp index 54221fa..9ebea15 100644 --- a/msm8998/android/location_api/GnssAPIClient.cpp +++ b/msm8998/android/location_api/GnssAPIClient.cpp @@ -303,14 +303,13 @@ void GnssAPIClient::onGnssNiCb(uint32_t id, GnssNiNotification gnssNiNotificatio else if (gnssNiNotification.type == GNSS_NI_TYPE_CONTROL_PLANE) notificationGnss.niType = IGnssNiCallback::GnssNiType::UMTS_CTRL_PLANE; else if (gnssNiNotification.type == GNSS_NI_TYPE_EMERGENCY_SUPL) - notificationGnss.niType = - static_cast<IGnssNiCallback::GnssNiType>(4/*hardcode until IGnssNiCallback adds value*/); + notificationGnss.niType = IGnssNiCallback::GnssNiType::EMERGENCY_SUPL; if (gnssNiNotification.options & GNSS_NI_OPTIONS_NOTIFICATION_BIT) notificationGnss.notifyFlags |= IGnssNiCallback::GnssNiNotifyFlags::NEED_NOTIFY; - else if (gnssNiNotification.options & GNSS_NI_OPTIONS_VERIFICATION_BIT) + if (gnssNiNotification.options & GNSS_NI_OPTIONS_VERIFICATION_BIT) notificationGnss.notifyFlags |= IGnssNiCallback::GnssNiNotifyFlags::NEED_VERIFY; - else if (gnssNiNotification.options & GNSS_NI_OPTIONS_PRIVACY_OVERRIDE_BIT) + if (gnssNiNotification.options & GNSS_NI_OPTIONS_PRIVACY_OVERRIDE_BIT) notificationGnss.notifyFlags |= IGnssNiCallback::GnssNiNotifyFlags::PRIVACY_OVERRIDE; notificationGnss.timeoutSec = gnssNiNotification.timeout; diff --git a/msm8998/core/Android.mk b/msm8998/core/Android.mk index 4aee6f7..b8d497e 100644 --- a/msm8998/core/Android.mk +++ b/msm8998/core/Android.mk @@ -6,8 +6,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libloc_core -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_OWNER := qti LOCAL_MODULE_TAGS := optional diff --git a/msm8998/gnss/Android.mk b/msm8998/gnss/Android.mk index 98a1ecb..fd8ceaa 100644 --- a/msm8998/gnss/Android.mk +++ b/msm8998/gnss/Android.mk @@ -6,8 +6,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libgnss -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_OWNER := qti LOCAL_MODULE_TAGS := optional diff --git a/msm8998/location/Android.mk b/msm8998/location/Android.mk index 8c649e0..b414338 100644 --- a/msm8998/location/Android.mk +++ b/msm8998/location/Android.mk @@ -6,8 +6,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := liblocation_api -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_OWNER := qti LOCAL_MODULE_TAGS := optional diff --git a/msm8998/utils/Android.mk b/msm8998/utils/Android.mk index 6e1f35e..ff18f2f 100644 --- a/msm8998/utils/Android.mk +++ b/msm8998/utils/Android.mk @@ -65,8 +65,7 @@ LOCAL_COPY_HEADERS:= \ loc_gps.h LOCAL_MODULE := libgps.utils -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_OWNER := qti LOCAL_MODULE_TAGS := optional diff --git a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk index 3920139..0d2afe7 100644 --- a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk +++ b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk @@ -42,8 +42,7 @@ LOCAL_COPY_HEADERS:= \ ../include/platform_lib_time.h LOCAL_MODULE := libloc_pla -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := qti diff --git a/msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk b/msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk index ab2ba4f..0b1132c 100644 --- a/msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk +++ b/msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk @@ -41,8 +41,7 @@ LOCAL_COPY_HEADERS:= \ ../include/loc_stub_time.h LOCAL_MODULE := libloc_stub -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_OWNER := qti LOCAL_MODULE_TAGS := optional |