Fix build issue on Android

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>

diff --git a/va/Android.mk b/va/Android.mk
index 0f872c3..22f80c8 100644 (file)
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -36,7 +36,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
        va.c \
        va_trace.c \
-       va_fool.c
+       va_fool.c  \
+       va_str.c
 
 LOCAL_CFLAGS_32 += \
        -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_32)\"" \

diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp
index ab54684..ae96236 100644 (file)
--- a/va/android/va_android.cpp
+++ b/va/android/va_android.cpp
@@ -206,7 +206,7 @@ VAStatus vaPutSurface (
 {
     VADriverContextP ctx;
 
-    if (fool_postp)
+    if (va_fool_postp)
         return VA_STATUS_SUCCESS;
 
     if (draw == NULL)

diff --git a/va/va_internal.h b/va/va_internal.h
index c666159..7b8da55 100644 (file)
--- a/va/va_internal.h
+++ b/va/va_internal.h
@@ -25,6 +25,10 @@
 #ifndef VA_INTERNAL_H
 #define VA_INTERNAL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
 #define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
 
@@ -35,4 +39,8 @@ int  va_parseConfig(char *env, char *env_value);
 
 VADisplayContextP va_newDisplayContext(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* VA_INTERNAL_H */