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 4d14cd6..b6f6f4f 100755 (executable)
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -1,9 +1,37 @@
+# Copyright (c) 2007 Intel Corporation. All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sub license, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice (including the
+# next paragraph) shall be included in all copies or substantial portions
+# of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 # For libva
 # =====================================================
 
 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)
 
@@ -13,11 +41,24 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
        va.c \
        va_trace.c \
-       va_fool.c 
+       va_fool.c
 
-LOCAL_CFLAGS += \
+LOCAL_CFLAGS_32 += \
        -DANDROID \
-       -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
+       -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_C_INCLUDES += \
        $(TARGET_OUT_HEADERS)/libva \
@@ -26,27 +67,32 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_COPY_HEADERS := \
        va.h \
-       va_version.h \
        va_backend.h \
-       va_version.h.in \
-       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
 
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva
 
-LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils
+LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils liblog
 
 include $(BUILD_SHARED_LIBRARY)
 
-intermediates := $(local-intermediates-dir)
-GEN := $(intermediates)/va_version.h
-$(GEN): PRIVATE_GEN_VERSION := $(LOCAL_PATH)/../build/gen_version.sh
-$(GEN): PRIVATE_INPUT_FILE := $(LOCAL_PATH)/va_version.h.in
-$(GEN): PRIVATE_CUSTOM_TOOL = sh $(PRIVATE_GEN_VERSION) $(LOCAL_PATH)/.. $(PRIVATE_INPUT_FILE) > $@
-$(GEN): $(LOCAL_PATH)/va_version.h
+GEN := $(LOCAL_PATH)/va_version.h
+$(GEN): SCRIPT := $(LOCAL_PATH)/../build/gen_version.sh
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = sh $(SCRIPT) $(PRIVATE_PATH)/.. $(PRIVATE_PATH)/va_version.h.in > $@
+$(GEN): $(LOCAL_PATH)/%.h : $(LOCAL_PATH)/%.h.in $(SCRIPT) $(LOCAL_PATH)/../configure.ac
        $(transform-generated-source)
-
 LOCAL_GENERATED_SOURCES += $(GEN) 
 
 # For libva-android
@@ -55,21 +101,51 @@ 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
 
 LOCAL_COPY_HEADERS := va_android.h             
 
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva-android
 
+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)
@@ -82,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 \
@@ -96,6 +172,7 @@ LOCAL_COPY_HEADERS := \
 
 LOCAL_SHARED_LIBRARIES := libva
 
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva-tpi
 
 include $(BUILD_SHARED_LIBRARY)