commit 0b27e398014d58cbd630c8f751a7d1a923b72841
author Kamal Negi <kamaln@codeaurora.org> Wed May 03 15:24:33 2017 +0530
committer Kamal Negi <kamaln@codeaurora.org> Wed May 03 15:24:33 2017 +0530
tree 73d2634f80af97b0cf16cea46e472fbb6fb454b1
parent 83355d2e3c872f430003a052b49da56e4473f61b
parent b345d45b2bb845f628e3c7d826cfbba9bdb4051e

Merge remote-tracking branch 'origin/fm.lnx.2.1-rel' into fm.lnx.2.9.1-rel

Change-Id: I9d61fbe8961676660c08a02ddf377894baf0e203

Android.mk

diff --git a/Android.mk b/Android.mk
index 03e16f0..406d11b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,7 @@
 
 LOCAL_MODULE_TAGS := optional
 
-#ifneq ($(TARGET_USES_AOSP),true)
+ifneq ($(TARGET_USES_AOSP),true)
 
 #ifeq ($(BOARD_HAVE_QCOM_FM),true)
 #ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
@@ -37,6 +37,6 @@
 
 #endif # is-vendor-board-platform
 #endif # BOARD_HAVE_QCOM_FM
-#endif # Not (TARGET_USES_AOSP)
+endif # Not (TARGET_USES_AOSP)
 LOCAL_PATH := $(LOCAL_DIR_PATH)
 include $(LOCAL_PATH)/libfm_jni/Android.mk

jni/ConfFileParser.cpp

diff --git a/jni/ConfFileParser.cpp b/jni/ConfFileParser.cpp
index ae8b15e..1644585 100644
--- a/jni/ConfFileParser.cpp
+++ b/jni/ConfFileParser.cpp
@@ -789,7 +789,7 @@
   const char *cur_grp
 )
 {
-  char *equal_start;
+  const char *equal_start;
   char *key;
   char *val;
   unsigned key_len;