diff options
| author | Niranjan Pendharkar <npendhar@codeaurora.org> | 2017-06-14 19:59:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-14 19:59:17 +0000 |
| commit | 7ed303470629122f0a469ce6ac99193ac0303c7d (patch) | |
| tree | 018067708997e7143f32b583e2737a5585854800 | |
| parent | dccc6a85432006c78b95fce2eadfd1d98eddd10e (diff) | |
| parent | 567bb9e6ee9dbafb89979271898c93ba415a9158 (diff) | |
| download | ipacfg-mgr-7ed303470629122f0a469ce6ac99193ac0303c7d.tar.gz | |
IPACM: move ipacm configuration file to /vendor/etc am: 70f4496c7a
am: 567bb9e6ee
Change-Id: I6585aebcaff26892353977748caa2d5640574f9b
| -rw-r--r-- | msm8998/ipacm/src/Android.mk | 4 | ||||
| -rw-r--r-- | msm8998/ipacm/src/IPACM_Config.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/msm8998/ipacm/src/Android.mk b/msm8998/ipacm/src/Android.mk index ed3fb8d..3302564 100644 --- a/msm8998/ipacm/src/Android.mk +++ b/msm8998/ipacm/src/Android.mk @@ -94,7 +94,7 @@ LOCAL_MODULE := $1 LOCAL_SRC_FILES := $1 LOCAL_MODULE_CLASS := ipacm LOCAL_MODULE_TAGS := debug -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) include $(BUILD_PREBUILT) endef @@ -102,7 +102,7 @@ endef include $(CLEAR_VARS) LOCAL_MODULE := IPACM_cfg.xml LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_OWNER := ipacm diff --git a/msm8998/ipacm/src/IPACM_Config.cpp b/msm8998/ipacm/src/IPACM_Config.cpp index 4b02b57..6218fb6 100644 --- a/msm8998/ipacm/src/IPACM_Config.cpp +++ b/msm8998/ipacm/src/IPACM_Config.cpp @@ -173,7 +173,11 @@ int IPACM_Config::Init(void) { IPACMERR("Failed opening %s.\n", DEVICE_NAME); } +#ifdef FEATURE_IPACM_HAL + strncpy(IPACM_config_file, "/vendor/etc/IPACM_cfg.xml", sizeof(IPACM_config_file)); +#else strncpy(IPACM_config_file, "/etc/IPACM_cfg.xml", sizeof(IPACM_config_file)); +#endif IPACMDBG_H("\n IPACM XML file is %s \n", IPACM_config_file); if (IPACM_SUCCESS == ipacm_read_cfg_xml(IPACM_config_file, cfg)) |