update NEWS for libva 2.4.0

[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 05e1541..0066558
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -25,69 +25,51 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-LIBVA_DRIVERS_PATH_32 = /system/lib
-LIBVA_DRIVERS_PATH_64 = /system/lib64
-
-# Version set to Android Jelly Bean
-ALOG_VERSION_REQ := 4.1
-ALOG_VERSION := $(filter $(ALOG_VERSION_REQ),$(firstword $(sort $(PLATFORM_VERSION) \
-                                   $(ALOG_VERSION_REQ))))
+LIBVA_DRIVERS_PATH_32 := /vendor/lib/dri
+LIBVA_DRIVERS_PATH_64 := /vendor/lib64/dri
 
 include $(CLEAR_VARS)
 
 #LIBVA_MINOR_VERSION := 31
-#LIBVA_MAJOR_VERSION := 0 
+#LIBVA_MAJOR_VERSION := 0
+
+IGNORED_WARNNING = \
+       -Wno-sign-compare \
+       -Wno-missing-field-initializers \
+       -Wno-unused-parameter \
 
 LOCAL_SRC_FILES := \
        va.c \
        va_trace.c \
-       va_fool.c
+       va_fool.c  \
+       va_str.c
 
 LOCAL_CFLAGS_32 += \
-       -DANDROID \
        -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_32)\"" \
-       -DLOG_TAG=\"libva\"
 
 LOCAL_CFLAGS_64 += \
-       -DANDROID \
        -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_64)\"" \
-       -DLOG_TAG=\"libva\"
 
-# Android Jelly Bean defined ALOGx, older versions use LOGx
-ifeq ($(ALOG_VERSION), $(ALOG_VERSION_REQ))
-LOCAL_CFLAGS += -DANDROID_ALOG
-else
-LOCAL_CFLAGS += -DANDROID_LOG
-endif
+LOCAL_CFLAGS := \
+       $(IGNORED_WARNNING) \
+       $(if $(filter user,$(TARGET_BUILD_VARIANT)),,-DENABLE_VA_MESSAGING) \
+       -DLOG_TAG=\"libva\"
 
-LOCAL_C_INCLUDES += \
-       $(TARGET_OUT_HEADERS)/libva \
-       $(LOCAL_PATH)/x11 \
-       $(LOCAL_PATH)/..
-
-LOCAL_COPY_HEADERS := \
-       va.h \
-       va_backend.h \
-       va_dec_hevc.h \
-       va_dec_jpeg.h \
-       va_drmcommon.h \
-       va_enc_hevc.h \
-       va_enc_jpeg.h \
-       va_enc_vp8.h \
-       va_enc_vp9.h \
-       va_dec_vp9.h \
-       va_version.h
-
-LOCAL_COPY_HEADERS_TO := libva/va
+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
 
 intermediates := $(call local-generated-sources-dir)
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+       $(intermediates) \
+       $(LOCAL_C_INCLUDES)
+
 GEN := $(intermediates)/va/va_version.h
 $(GEN): SCRIPT := $(LOCAL_PATH)/../build/gen_version.sh
 $(GEN): PRIVATE_CUSTOM_TOOL = sh $(SCRIPT) $(<D)/.. $< > $@
@@ -107,74 +89,16 @@ LOCAL_SRC_FILES := \
        drm/va_drm_utils.c
 
 LOCAL_CFLAGS += \
-       -DANDROID -DLOG_TAG=\"libva-android\"
+       -DLOG_TAG=\"libva-android\" \
+       $(IGNORED_WARNNING)
 
 LOCAL_C_INCLUDES += \
-       $(TARGET_OUT_HEADERS)/libva \
-       $(TARGET_OUT_HEADERS)/libdrm \
        $(LOCAL_PATH)/drm
 
-LOCAL_COPY_HEADERS_TO := libva/va
-
-LOCAL_COPY_HEADERS := va_android.h             
-
 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 += \
-       -DANDROID -DLOG_TAG=\"libva-egl\"
-
-LOCAL_C_INCLUDES += \
-       $(TARGET_OUT_HEADERS)/libva \
-       $(LOCAL_PATH)/x11
-
-LOCAL_COPY_HEADERS_TO := libva/va
-
-LOCAL_COPY_HEADERS := egl/va_egl.h egl/va_backend_egl.h
-
-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 += -DANDROID -DLOG_TAG=\"libva-tpi\"
-
-LOCAL_C_INCLUDES += \
-       $(TARGET_OUT_HEADERS)/libva \
-       $(LOCAL_PATH)/..
-
-LOCAL_COPY_HEADERS_TO := libva/va
-
-LOCAL_COPY_HEADERS := \
-       va_tpi.h \
-       va_backend_tpi.h
-
-LOCAL_SHARED_LIBRARIES := libva
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libva-tpi
+LOCAL_SHARED_LIBRARIES := libva libdrm liblog
 
 include $(BUILD_SHARED_LIBRARY)