android: fix the rules to generate va_version.h

Android source tree has to be read-only. The generated files should
be put to the $(OUT)/gen/ dir. Besides, LOCAL_GENERATED_SOURCES must
be set before include $(BUILD_SHARED_LIBRARY). Otherwise it has no
effect.

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
(cherry picked from commit cfcd7c5e1a65a08b36ae3114f7248f5fb92ed64b)

diff --git a/va/Android.mk b/va/Android.mk
index b6f6f4f..05e1541 100755 (executable)
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -82,19 +82,21 @@ LOCAL_COPY_HEADERS_TO := libva/va
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
 LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils liblog
 
-include $(BUILD_SHARED_LIBRARY)
+intermediates := $(call local-generated-sources-dir)
 
-GEN := $(LOCAL_PATH)/va_version.h
+GEN := $(intermediates)/va/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
+$(GEN): PRIVATE_CUSTOM_TOOL = sh $(SCRIPT) $(<D)/.. $< > $@
+$(GEN): $(intermediates)/va/%.h : $(LOCAL_PATH)/%.h.in $(LOCAL_PATH)/../configure.ac
        $(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN) 
 
+include $(BUILD_SHARED_LIBRARY)
+
 # For libva-android
 # =====================================================