commit e8214dfc1e5676f24bd08a4afa4009cc86624ded
author himta ram <hram@codeaurora.org> Mon Dec 09 20:30:01 2019 +0530
committer himta ram <hram@codeaurora.org> Tue Dec 10 16:25:10 2019 +0530
tree ecf729608ec5e4998f264ca3b76724f427b4920c
parent da2d4ccc6fa15e9c4aae71a7d0591c80e2c06f1d

Fix CFI issues in FM project.

CFI check is failing during fm jni callback due
to difference in function signatures.
The patch fixes the issue by matching the function signatures.

CRs-Fixed: 2583457
Change-Id: Ife2b6a882c32d13cb6cc5669d685805be7eb046c

jni/Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 957947a..02be1b6 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -21,7 +21,9 @@
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
                    $(TOP)/libnativehelper/include/nativehelper \
                    $(TOP)/vendor/qcom/opensource/commonsys-intf/bluetooth/include \
-                   $(TOP)/vendor/qcom/opensource/commonsys/bluetooth_ext/system_bt_ext/btconfigstore
+                   $(TOP)/vendor/qcom/opensource/commonsys/bluetooth_ext/system_bt_ext/btconfigstore \
+                   vendor/qcom/opensource/commonsys/fm/helium
+
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_MODULE := libqcomfm_jni