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

Moving conf files to /vendor/etc

Browse source 
Moving all vendor specific conf files to /vendor/etc instead of
current /etc folder

CRs-Fixed: 1099981
Change-Id: I4495d8527941959be0847c4722ea8b68ee6c87ee
This commit is contained in:
Saurabh Srivastava 2016-12-22 01:17:04 +05:30 committed by Gerrit - the friendly Code Review server
parent b6928aae36
commit b37098920f
5 changed files with 52 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/ContextBase.cpp
View file

@ -145,10 +145,8 @@ void ContextBase::readConfig()
/* inject supl config to modem with config values from config.xml or gps.conf, default 1 */ /* inject supl config to modem with config values from config.xml or gps.conf, default 1 */
mGps_conf.AGPS_CONFIG_INJECT = 1; mGps_conf.AGPS_CONFIG_INJECT = 1;
const char* GPS_CONF_FILE = "/etc/gps.conf"; UTIL_READ_CONF(LOC_PATH_GPS_CONF, mGps_conf_table);
const char* SAP_CONF_FILE = "/etc/sap.conf"; UTIL_READ_CONF(LOC_PATH_SAP_CONF, mSap_conf_table);
UTIL_READ_CONF(GPS_CONF_FILE, mGps_conf_table);
UTIL_READ_CONF(SAP_CONF_FILE, mSap_conf_table);
} }
uint32_t ContextBase::getCarrierCapabilities() { uint32_t ContextBase::getCarrierCapabilities() {

2
core/loc_gps.h
View file

@ -2187,7 +2187,7 @@ typedef struct {
* Deliver GNSS configuration contents to HAL. * Deliver GNSS configuration contents to HAL.
* Parameters: * Parameters:
* config_data - a pointer to a char array which holds what usually is expected from * 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. * length - total number of UTF8 characters in configuraiton data.
* *
* IMPORTANT: * IMPORTANT:

2
etc/Android.mk
View file

@ -5,7 +5,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := gps.conf LOCAL_MODULE := gps.conf
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/
LOCAL_SRC_FILES := gps.conf LOCAL_SRC_FILES := gps.conf
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)

12
utils/platform_lib_abstractions/loc_pla/include/platform_lib_macros.h
View file

@ -66,6 +66,18 @@ extern "C" {
#endif /* USE_GLIB */ #endif /* USE_GLIB */
// Below are the location conf file paths
extern const char LOC_PATH_GPS_CONF[];
extern const char LOC_PATH_IZAT_CONF[];
extern const char LOC_PATH_FLP_CONF[];
extern const char LOC_PATH_LOWI_CONF[];
extern const char LOC_PATH_SAP_CONF[];
extern const char LOC_PATH_APDR_CONF[];
extern const char LOC_PATH_XTWIFI_CONF[];
extern const char LOC_PATH_QUIPC_CONF[];
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /*__cplusplus */ #endif /*__cplusplus */

36
utils/platform_lib_abstractions/loc_pla/src/platform_lib_log_util.cpp
View file

@ -26,6 +26,7 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "platform_lib_log_util.h" #include "platform_lib_log_util.h"
#include "platform_lib_macros.h"
char * get_timestamp(char *str, unsigned long buf_size) char * get_timestamp(char *str, unsigned long buf_size)
{ {
@ -40,3 +41,38 @@ char * get_timestamp(char *str, unsigned long buf_size)
return str; return str;
} }
// Below are the location conf file paths
#ifdef __ANDROID__
#define LOC_PATH_GPS_CONF_STR "/vendor/etc/gps.conf"
#define LOC_PATH_IZAT_CONF_STR "/vendor/etc/izat.conf"
#define LOC_PATH_FLP_CONF_STR "/vendor/etc/flp.conf"
#define LOC_PATH_LOWI_CONF_STR "/vendor/etc/lowi.conf"
#define LOC_PATH_SAP_CONF_STR "/vendor/etc/sap.conf"
#define LOC_PATH_APDR_CONF_STR "/vendor/etc/apdr.conf"
#define LOC_PATH_XTWIFI_CONF_STR "/vendor/etc/xtwifi.conf"
#define LOC_PATH_QUIPC_CONF_STR "/vendor/etc/quipc.conf"
#else
#define LOC_PATH_GPS_CONF_STR "/etc/gps.conf"
#define LOC_PATH_IZAT_CONF_STR "/etc/izat.conf"
#define LOC_PATH_FLP_CONF_STR "/etc/flp.conf"
#define LOC_PATH_LOWI_CONF_STR "/etc/lowi.conf"
#define LOC_PATH_SAP_CONF_STR "/etc/sap.conf"
#define LOC_PATH_APDR_CONF_STR "/etc/apdr.conf"
#define LOC_PATH_XTWIFI_CONF_STR "/etc/xtwifi.conf"
#define LOC_PATH_QUIPC_CONF_STR "/etc/quipc.conf"
#endif // __ANDROID__
// Reference below arrays wherever needed to avoid duplicating
// same conf path string over and again in location code.
const char LOC_PATH_GPS_CONF[] = LOC_PATH_GPS_CONF_STR;
const char LOC_PATH_IZAT_CONF[] = LOC_PATH_IZAT_CONF_STR;
const char LOC_PATH_FLP_CONF[] = LOC_PATH_FLP_CONF_STR;
const char LOC_PATH_LOWI_CONF[] = LOC_PATH_LOWI_CONF_STR;
const char LOC_PATH_SAP_CONF[] = LOC_PATH_SAP_CONF_STR;
const char LOC_PATH_APDR_CONF[] = LOC_PATH_APDR_CONF_STR;
const char LOC_PATH_XTWIFI_CONF[] = LOC_PATH_XTWIFI_CONF_STR;
const char LOC_PATH_QUIPC_CONF[] = LOC_PATH_QUIPC_CONF_STR;