commit 2939cf73d10ec29db2ecf45525a351f9f96427c4
author Mahesh Kumar Sharma <smahesh@codeaurora.org> Wed May 13 20:58:47 2015 -0700
committer Mahesh Kumar Sharma <smahesh@codeaurora.org> Wed May 13 20:58:47 2015 -0700
tree a9cf2619f5f34fe756ce4ce5cd61df83dc9051e1
parent f5d3903b3d1ae522c33bba71c280a142904420db

FM: Handle the compilation errors

tavarua.h is remoeved in 3.18 kernel
Defined required definitions in android_hardware_fm.cpp

Change-Id: I8e2022fb6b45972b8155a4144abf81e86aaee41c

jni/android_hardware_fm.cpp

diff --git a/jni/android_hardware_fm.cpp b/jni/android_hardware_fm.cpp
index 82fdb97..b97c554 100644
--- a/jni/android_hardware_fm.cpp
+++ b/jni/android_hardware_fm.cpp
@@ -38,7 +38,6 @@
 #include <cutils/properties.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <media/tavarua.h>
 #include <linux/videodev2.h>
 #include <math.h>
 
@@ -59,6 +58,16 @@
 #define WAIT_TIMEOUT 200000 /* 200*1000us */
 #define TX_RT_DELIMITER    0x0d
 #define PS_LEN    9
+#define V4L2_CID_PRIVATE_TAVARUA_STOP_RDS_TX_RT 0x08000017
+#define V4L2_CID_PRIVATE_TAVARUA_STOP_RDS_TX_PS_NAME 0x08000016
+#define V4L2_CID_PRIVATE_UPDATE_SPUR_TABLE 0x08000034
+#define V4L2_CID_PRIVATE_TAVARUA_TX_SETPSREPEATCOUNT 0x08000034
+#define MASK_PI                    (0x0000FFFF)
+#define MASK_PI_MSB                (0x0000FF00)
+#define MASK_PI_LSB                (0x000000FF)
+#define MASK_PTY                   (0x0000001F)
+#define MASK_TXREPCOUNT            (0x0000000F)
+
 enum search_dir_t {
     SEEK_UP,
     SEEK_DN,