commit 35a19e8c3098a70d9b1b1efc76d087aa95410bd8
author Satish kumar sugasi <ssugas@codeaurora.org> Sat Apr 08 18:39:25 2017 -0700
committer Satish kumar sugasi <ssugas@codeaurora.org> Mon May 08 12:59:44 2017 -0700
tree 4c34e8d86a0401bcd99286b204931b1140dc0473
parent 0b27e398014d58cbd630c8f751a7d1a923b72841

Changes to enable FM using old hal method

This is done tempararily to test FM with O rel
in bringup of new chipset

Change-Id: I6acf159d1bc6ece9e506587e1035b15727240cf2

Android.mk

diff --git a/Android.mk b/Android.mk
index 406d11b..20c88ef 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)))
@@ -12,6 +12,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, qcom/fmradio)
 LOCAL_JNI_SHARED_LIBRARIES := libqcomfm_jni
 
+LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_MODULE:= qcom.fmradio
 
 include $(BUILD_JAVA_LIBRARY)
@@ -37,6 +38,7 @@
 
 #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

fm_hci/Android.mk

diff --git a/fm_hci/Android.mk b/fm_hci/Android.mk
index c164235..f0e620e 100644
--- a/fm_hci/Android.mk
+++ b/fm_hci/Android.mk
@@ -20,6 +20,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
          libdl \
+         liblog \
          libcutils
 
 LOCAL_CFLAGS := -Wno-unused-parameter

fm_hci/fm_hci.c

diff --git a/fm_hci/fm_hci.c b/fm_hci/fm_hci.c
index 9d0dafc..f45a00a 100644
--- a/fm_hci/fm_hci.c
+++ b/fm_hci/fm_hci.c
@@ -229,7 +229,8 @@
                             pthread_cond_signal(&hci->cmd_credits_cond);
                         } else if (pbuf->evt_code == FM_HW_ERR_EVENT) {
                               ALOGI("%s: FM H/w Err Event Recvd. Event Code: 0x%2x", __func__, pbuf->evt_code);
-                              hci->vendor->ssr_cleanup(0x22);
+                         /*  remove until support added */
+                              //hci->vendor->ssr_cleanup(0x22);
                               status  = power(hci, FM_RADIO_DISABLE);
                               if (status < 0) {
                                  ALOGE("power off fm radio failed during SSR ");

fmhalService/Android.mk

diff --git a/fmhalService/Android.mk b/fmhalService/Android.mk
index ad67eb9..cf0bdc0 100644
--- a/fmhalService/Android.mk
+++ b/fmhalService/Android.mk
@@ -20,7 +20,8 @@
 
 LOCAL_SHARED_LIBRARIES := \
          libdl \
-         libcutils
+         libcutils \
+         liblog
 
 LOCAL_CFLAGS := -Wno-unused-parameter
 

helium/Android.mk

diff --git a/helium/Android.mk b/helium/Android.mk
index 5cbc551..068308b 100644
--- a/helium/Android.mk
+++ b/helium/Android.mk
@@ -11,6 +11,7 @@
 LOCAL_SHARED_LIBRARIES := \
          libfm-hci \
          libdl \
+         liblog \
          libnativehelper \
          libcutils
 

jni/Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 06a313f..d3df8b9 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -17,6 +17,7 @@
 LOCAL_SHARED_LIBRARIES := \
         libandroid_runtime \
         libnativehelper \
+        liblog \
         libcutils
 
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

libfm_jni/Android.mk

diff --git a/libfm_jni/Android.mk b/libfm_jni/Android.mk
index f62e3f1..af66eb5 100644
--- a/libfm_jni/Android.mk
+++ b/libfm_jni/Android.mk
@@ -17,6 +17,7 @@
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libdl \
+    liblog \
     libmedia \
     libnativehelper \