Update some comment about FEI in VA-API.

[android-x86/hardware-intel-common-libva.git] / va / Android.mk

diff --git a/va/Android.mk b/va/Android.mk
old mode 100755 (executable)
new mode 100644 (file)
index fba41fa..22f80c8
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -25,8 +25,8 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-LIBVA_DRIVERS_PATH_32 = /system/lib
-LIBVA_DRIVERS_PATH_64 = /system/lib64
+LIBVA_DRIVERS_PATH_32 := /vendor/lib/dri
+LIBVA_DRIVERS_PATH_64 := /vendor/lib64/dri
 
 include $(CLEAR_VARS)
 
@@ -36,14 +36,17 @@ 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)\"" \
-       -DLOG_TAG=\"libva\"
 
 LOCAL_CFLAGS_64 += \
        -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_64)\"" \
+
+LOCAL_CFLAGS := \
+       $(if $(filter user,$(TARGET_BUILD_VARIANT)),,-DENABLE_VA_MESSAGING) \
        -DLOG_TAG=\"libva\"
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
@@ -51,6 +54,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils liblog
 
@@ -86,43 +90,8 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva-android
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_SHARED_LIBRARIES := libva libdrm
 
 include $(BUILD_SHARED_LIBRARY)
-
-
-# For libva-egl
-# =====================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-       egl/va_egl.c
-
-LOCAL_CFLAGS += \
-       -DLOG_TAG=\"libva-egl\"
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libva-egl
-
-LOCAL_SHARED_LIBRARIES := libva
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-# For libva-tpi
-# =====================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := va_tpi.c
-
-LOCAL_CFLAGS += -DLOG_TAG=\"libva-tpi\"
-
-LOCAL_SHARED_LIBRARIES := libva
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libva-tpi
-
-include $(BUILD_SHARED_LIBRARY)