summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Yuan <shengquan.yuan@gmail.com>2010-12-21 18:46:53 +0800
committerAustin Yuan <shengquan.yuan@gmail.com>2010-12-21 18:46:53 +0800
commit67968b9001a0923dbdf582c2c16338de431d7086 (patch)
tree17eaa0b0f9474b3da809ae8051c330994a008562
parent4326718f0c8f62a5b0c8e43ae7ef721986b17b25 (diff)
Fix the build issue on Android
Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>
-rw-r--r--va/Android.mk28
1 files changed, 16 insertions, 12 deletions
diff --git a/va/Android.mk b/va/Android.mk
index d795c38..795f27f 100644
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -10,24 +10,35 @@ include $(CLEAR_VARS)
#LIBVA_MINOR_VERSION := 31
#LIBVA_MAJOR_VERSION := 0
-LOCAL_SRC_FILES := \
- va.c \
- va_trace.c \
- va_fool.c
+
+LOCAL_MODULE := libva
+
+LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils
+
+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 $(PRIVATE_GEN_VERSION)
+$(GEN): $(LOCAL_PATH)/va_version.h
$(transform-generated-source)
+
LOCAL_GENERATED_SOURCES += $(GEN)
+LOCAL_SRC_FILES := \
+ va.c \
+ va_trace.c \
+ va_fool.c
+
+
LOCAL_CFLAGS += \
-DANDROID \
-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
+LOCAL_COPY_HEADERS_TO := libva/va
+
LOCAL_C_INCLUDES += \
$(TARGET_OUT_HEADERS)/libva \
$(LOCAL_PATH)/x11 \
@@ -40,13 +51,6 @@ LOCAL_COPY_HEADERS := \
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