summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRen Zhaohan <zhaohan.ren@intel.com>2010-05-27 11:50:49 +0800
committerRen Zhaohan <zhaohan.ren@intel.com>2010-05-27 11:50:49 +0800
commit2ac7652af2c37187ab775895ab5b68d75645cbed (patch)
tree13c22f944915488d6240c8f477a7aa606eaaa0d5
parent795896536af5abcd85f36870a5dbc41b1f6fe59e (diff)
downloadlibva-2ac7652af2c37187ab775895ab5b68d75645cbed.tar.gz
libva + libva_android + libva_android_tpi
-rw-r--r--va/Android.mk78
1 files changed, 49 insertions, 29 deletions
diff --git a/va/Android.mk b/va/Android.mk
index 6f94ff8..d896173 100644
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -1,45 +1,68 @@
-# For libva_android
+# For libva
# =====================================================
LOCAL_PATH:= $(call my-dir)
-LIBVA_MINOR_VERSION := 31
-LIBVA_MAJOR_VERSION := 0
+LIBVA_DRIVERS_PATH = /system/lib
include $(CLEAR_VARS)
-LIBVA_DRIVERS_PATH = /system/lib
+#LIBVA_MINOR_VERSION := 31
+#LIBVA_MAJOR_VERSION := 0
LOCAL_SRC_FILES := \
- va.c \
- va_trace.c \
- android/va_android.cpp
+ va.c \
+ va_trace.c \
LOCAL_CFLAGS += -DHAVE_CONFIG_H \
-DANDROID \
-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
LOCAL_C_INCLUDES += \
- $(TARGET_OUT_HEADERS)/libva \
- $(LOCAL_PATH)/x11 \
- $(LOCAL_PATH)/..
+ $(TARGET_OUT_HEADERS)/libva \
+ $(LOCAL_PATH)/x11 \
+ $(LOCAL_PATH)/..
+
+LOCAL_COPY_HEADERS := \
+ va.h \
+ va_version.h \
+ va_backend.h \
+ va_version.h.in \
+ x11/va_dricommon.h
+
+LOCAL_COPY_HEADERS_TO := libva/va
+
+LOCAL_MODULE := libva
+
+LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils
+
+include $(BUILD_SHARED_LIBRARY)
+
+
+# For libva_android
+# =====================================================
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ android/va_android.cpp
+
+LOCAL_CFLAGS += \
+ -DHAVE_CONFIG_H \
+ -DANDROID
+
+LOCAL_C_INCLUDES += \
+ $(TARGET_OUT_HEADERS)/libva \
+ $(LOCAL_PATH)/x11
LOCAL_CXX := g++
LOCAL_COPY_HEADERS_TO := libva/va
-LOCAL_COPY_HEADERS := \
- va.h \
- va_version.h \
- va_backend.h \
- va_version.h.in \
- x11/va_dricommon.h \
- va_android.h
+LOCAL_COPY_HEADERS := va_android.h
LOCAL_MODULE := libva_android
-LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils
-
include $(BUILD_SHARED_LIBRARY)
@@ -48,24 +71,21 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
- va_tpi.c \
+LOCAL_SRC_FILES := va_tpi.c
-LOCAL_CFLAGS += -DANDROID \
+LOCAL_CFLAGS += -DANDROID
LOCAL_C_INCLUDES += \
- $(TARGET_OUT_HEADERS)/libva \
- $(LOCAL_PATH)/..
+ $(TARGET_OUT_HEADERS)/libva \
+ $(LOCAL_PATH)/..
LOCAL_COPY_HEADERS_TO := libva/va
LOCAL_COPY_HEADERS := \
- va.h \
- va_backend.h \
- va_tpi.h \
- va_backend_tpi.h
+ va_tpi.h \
+ va_backend_tpi.h
-LOCAL_SHARED_LIBRARIES := libva_android
+LOCAL_SHARED_LIBRARIES := libva
LOCAL_MODULE := libva_android_tpi