Fixed compilation issues in Android

Change-Id: I031365909dbaec29e4c998891e28c16e7f38e530
Signed-off-by: zhangyichix <yichix.zhang@intel.com>
Signed-off-by: zhepeng.xu <zhepengx.xu@intel.com>
Signed-off-by: JeevakaPrabu <jeevaka.badrappan@intel.com>

cmrtlib/linux/hardware/cm_device_os.cpp

@@ -483,18 +483,20 @@ CmDevice_RT::CmDevice_RT(
     m_deviceInUmd(nullptr),
     m_cmCreated(true),
     m_vaDisplay(vaDisplay),
+    m_drmIndex(0),
+    m_fvaCmExtSendReqMsg(nullptr),
 #ifdef ANDROID
     m_display(nullptr),
 #endif
-    m_drmIndex(0),
-    m_fvaCmExtSendReqMsg(nullptr),
     m_gtpinEnabled(false),
     m_gtpinBufferUP0(nullptr),
     m_gtpinBufferUP1(nullptr),
     m_gtpinBufferUP2(nullptr),
     m_createOption(createOption),
-    m_driverStoreEnabled(0),
-    m_driFileDescriptor(0)
+#if !defined(ANDROID)
+    m_driFileDescriptor(0),
+#endif
+    m_driverStoreEnabled(0)
 {
 
     // New Surface Manager

media_driver/linux/common/ddi/media_libva.h

@@ -43,6 +43,7 @@
 #include <va/va_backend_prot.h>
 #endif
 #ifdef ANDROID
+#include <va/va_android.h>
 #if VA_MAJOR_VERSION < 1
 #include "va_internal_android.h"
 #endif

media_softlet/agnostic/common/vp/hal/bufferMgr/vp_allocator.cpp

@@ -740,7 +740,7 @@ MOS_STATUS VpAllocator::AllocParamsInitType(
     VP_FUNC_CALL();
     VP_PUBLIC_CHK_NULL_RETURN(surface);
 
-#if !EMUL && !LINUX
+#if !EMUL && !LINUX && !ANDROID
     //  Need to reallocate surface according to expected tiletype instead of tiletype of the surface what we have
     if ( surface                           != nullptr &&
          surface->OsResource.pGmmResInfo   != nullptr &&

media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c

@@ -3932,7 +3932,7 @@ bool KernelDll_BuildKernel_CmFc(Kdll_State *pState, Kdll_SearchState *pSearchSta
     VP_RENDER_FUNCTION_ENTER;
 
     // Disable pop-up box window for STL assertion to avoid VM hang in auto test.
-#if (!LINUX)
+#if (!LINUX && !ANDROID)
     uint32_t prevErrorMode = ::SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
 #if defined(_MSC_VER)
     ::_set_error_mode(_OUT_TO_STDERR);
@@ -4062,7 +4062,7 @@ bool KernelDll_BuildKernel_CmFc(Kdll_State *pState, Kdll_SearchState *pSearchSta
     res = true;
 
 finish:
-#if (!LINUX)
+#if (!LINUX && !ANDROID)
     ::SetErrorMode(prevErrorMode);
 #endif
     return res;

media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp

@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/sem.h>
 #include <sys/mman.h>
-#include "mos_compat.h" // libc variative definitions: backtrace
 #include "mos_user_setting.h"
 #include "mos_utilities_specific.h"
 #include "mos_utilities.h"

media_softlet/linux/common/os/xe/mos_bufmgr_xe.c

@@ -32,7 +32,6 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <signal.h>
-#include <pciaccess.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <unistd.h>