Disable module for pure AOSP configuration
Module requires framework changes not supported by
pure AOSP configuration. Also fix const char*/char*
assignment in libqcomfm_jni.
Change-Id: I71d125230cd772725ecc27ea346c911ea2505e7e
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
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;