Remove unused local varibles in upload_source_YUV_once_for_all.

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

diff --git a/va/Android.mk b/va/Android.mk
index 6777f6d..b6f6f4f 100755 (executable)
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -25,7 +25,13 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-LIBVA_DRIVERS_PATH = /system/lib
+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))))
 
 include $(CLEAR_VARS)
 
@@ -37,9 +43,22 @@ LOCAL_SRC_FILES := \
        va_trace.c \
        va_fool.c
 
-LOCAL_CFLAGS += \
+LOCAL_CFLAGS_32 += \
+       -DANDROID \
+       -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_32)\"" \
+       -DLOG_TAG=\"libva\"
+
+LOCAL_CFLAGS_64 += \
        -DANDROID \
-       -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
+       -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_C_INCLUDES += \
        $(TARGET_OUT_HEADERS)/libva \
@@ -48,9 +67,16 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_COPY_HEADERS := \
        va.h \
-       va_version.h \
        va_backend.h \
-       x11/va_dricommon.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
 
@@ -75,14 +101,16 @@ LOCAL_GENERATED_SOURCES += $(GEN)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-       android/va_android.cpp
+       android/va_android.cpp \
+       drm/va_drm_utils.c
 
 LOCAL_CFLAGS += \
-       -DANDROID 
+       -DANDROID -DLOG_TAG=\"libva-android\"
 
 LOCAL_C_INCLUDES += \
        $(TARGET_OUT_HEADERS)/libva \
-       $(LOCAL_PATH)/x11
+       $(TARGET_OUT_HEADERS)/libdrm \
+       $(LOCAL_PATH)/drm
 
 LOCAL_COPY_HEADERS_TO := libva/va
 
@@ -91,7 +119,7 @@ LOCAL_COPY_HEADERS := va_android.h
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva-android
 
-LOCAL_SHARED_LIBRARIES := libva
+LOCAL_SHARED_LIBRARIES := libva libdrm
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -105,7 +133,7 @@ LOCAL_SRC_FILES := \
        egl/va_egl.c
 
 LOCAL_CFLAGS += \
-       -DANDROID
+       -DANDROID -DLOG_TAG=\"libva-egl\"
 
 LOCAL_C_INCLUDES += \
        $(TARGET_OUT_HEADERS)/libva \
@@ -130,7 +158,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := va_tpi.c
 
-LOCAL_CFLAGS += -DANDROID
+LOCAL_CFLAGS += -DANDROID -DLOG_TAG=\"libva-tpi\"
 
 LOCAL_C_INCLUDES += \
        $(TARGET_OUT_HEADERS)/libva \