FM: Refactoring FM audio interaction

On latest android version, FM audio interaction has been changed.

Change-Id: If468044d0f656d9f30465ecba34b9ddd5650c360
diff --git a/Android.mk b/Android.mk
index cfbd558..4777981 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,10 +4,10 @@
 
 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)))
+#ifeq ($(BOARD_HAVE_QCOM_FM),true)
+#ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
 
 LOCAL_SRC_FILES := $(call all-java-files-under, qcom/fmradio)
 LOCAL_JNI_SHARED_LIBRARIES := libqcomfm_jni
@@ -17,14 +17,14 @@
 include $(BUILD_JAVA_LIBRARY)
 
 include $(LOCAL_PATH)/jni/Android.mk
-#LOCAL_PATH := $(LOCAL_DIR_PATH)
-#include $(LOCAL_PATH)/fmapp2/Android.mk
+LOCAL_PATH := $(LOCAL_DIR_PATH)
+include $(LOCAL_PATH)/fmapp2/Android.mk
 #LOCAL_PATH := $(LOCAL_DIR_PATH)
 #include $(LOCAL_PATH)/FMRecord/Android.mk
-endif # is-vendor-board-platform
-endif # BOARD_HAVE_QCOM_FM
+#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