diff options
| author | Thierry Strudel <tstrudel@google.com> | 2017-03-11 14:59:08 -0800 |
|---|---|---|
| committer | Thierry Strudel <tstrudel@google.com> | 2017-03-11 14:59:43 -0800 |
| commit | f61e72231a566483d798c8bf446a00c7d736d1a5 (patch) | |
| tree | d80674dcd1a42c552aade49a3423b29e43aecf95 | |
| parent | b4dcb0e3da7f3f737289d237b53b6b5e904b5284 (diff) | |
| download | gps-f61e72231a566483d798c8bf446a00c7d736d1a5.tar.gz | |
msm8998: read conf files from /vendor/etc
Change-Id: I6933304f0d5b11dffc82b74479d5b468a3c6b418
Signed-off-by: Thierry Strudel <tstrudel@google.com>
| -rw-r--r-- | msm8998/android/location_api/FlpAPIClient.h | 2 | ||||
| -rw-r--r-- | msm8998/core/ContextBase.cpp | 4 | ||||
| -rw-r--r-- | msm8998/core/loc_gps.h | 2 | ||||
| -rw-r--r-- | msm8998/etc/Android.mk | 2 | ||||
| -rw-r--r-- | msm8998/location/LocationAPIClientBase.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/msm8998/android/location_api/FlpAPIClient.h b/msm8998/android/location_api/FlpAPIClient.h index 9f9be1e..9fc7e19 100644 --- a/msm8998/android/location_api/FlpAPIClient.h +++ b/msm8998/android/location_api/FlpAPIClient.h @@ -36,7 +36,7 @@ #include <LocationAPIClientBase.h> -#define FLP_CONF_FILE "/etc/flp.conf" +#define FLP_CONF_FILE "/vendor/etc/flp.conf" namespace android { namespace hardware { diff --git a/msm8998/core/ContextBase.cpp b/msm8998/core/ContextBase.cpp index a9858e2..4f8c4d1 100644 --- a/msm8998/core/ContextBase.cpp +++ b/msm8998/core/ContextBase.cpp @@ -145,8 +145,8 @@ void ContextBase::readConfig() /* inject supl config to modem with config values from config.xml or gps.conf, default 1 */ mGps_conf.AGPS_CONFIG_INJECT = 1; - const char* GPS_CONF_FILE = "/etc/gps.conf"; - const char* SAP_CONF_FILE = "/etc/sap.conf"; + const char* GPS_CONF_FILE = "/vendor/etc/gps.conf"; + const char* SAP_CONF_FILE = "/vendor/etc/sap.conf"; UTIL_READ_CONF(GPS_CONF_FILE, mGps_conf_table); UTIL_READ_CONF(SAP_CONF_FILE, mSap_conf_table); } diff --git a/msm8998/core/loc_gps.h b/msm8998/core/loc_gps.h index cdb1af6..2e495b8 100644 --- a/msm8998/core/loc_gps.h +++ b/msm8998/core/loc_gps.h @@ -2187,7 +2187,7 @@ typedef struct { * Deliver GNSS configuration contents to HAL. * Parameters: * config_data - a pointer to a char array which holds what usually is expected from - file(/etc/gps.conf), i.e., a sequence of UTF8 strings separated by '\n'. + file(/vendor/etc/gps.conf), i.e., a sequence of UTF8 strings separated by '\n'. * length - total number of UTF8 characters in configuraiton data. * * IMPORTANT: diff --git a/msm8998/etc/Android.mk b/msm8998/etc/Android.mk index 025d3f7..d9eb0e1 100644 --- a/msm8998/etc/Android.mk +++ b/msm8998/etc/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := gps.conf LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/ LOCAL_SRC_FILES := gps.conf include $(BUILD_PREBUILT) diff --git a/msm8998/location/LocationAPIClientBase.cpp b/msm8998/location/LocationAPIClientBase.cpp index 3413d3e..6a062eb 100644 --- a/msm8998/location/LocationAPIClientBase.cpp +++ b/msm8998/location/LocationAPIClientBase.cpp @@ -33,7 +33,7 @@ #include <loc_cfg.h> #include "LocationAPIClientBase.h" -#define FLP_CONF_FILE "/etc/flp.conf" +#define FLP_CONF_FILE "/vendor/etc/flp.conf" LocationAPIClientBase::LocationAPIClientBase() : mTrackingCallback(nullptr), |