From 67968b9001a0923dbdf582c2c16338de431d7086 Mon Sep 17 00:00:00 2001
From: Austin Yuan <shengquan.yuan@gmail.com>
Date: Tue, 21 Dec 2010 18:46:53 +0800
Subject: [PATCH] Fix the build issue on Android

Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>
---
 va/Android.mk | 28 ++++++++++++++++------------
 1 file 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
-- 
2.7.4