commit bf216ce6293f1704e1491091dbc86c1e43a2c626
author Dan Willemsen <dwillemsen@google.com> Wed Jun 22 20:39:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 22 20:39:16 2016 +0000
tree 59ee603b5a86af2c49d438d68a12297008d2e7d1
parent bb5b2001f9093d0c6e50639bc98db15b0418ef43
parent 63f822dff8eb762f0a57be8c0eb84fe5ae043a09

Fix builds with readonly source directories
am: 63f822dff8

Change-Id: Iada76d2cf8eafb3dfd3522880d1c7cb15e5a1b0c

va/Android.mk

diff --git a/va/Android.mk b/va/Android.mk
index 3a66ee5..c8af633 100755
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -56,7 +56,6 @@
 
 LOCAL_COPY_HEADERS := \
 	va.h \
-	va_version.h \
 	va_dec_hevc.h \
 	va_dec_jpeg.h \
 	va_dec_vp8.h \
@@ -80,13 +79,13 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-GEN := $(LOCAL_PATH)/va_version.h
+GEN := $(TARGET_OUT_HEADERS)/libva/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 = /bin/bash $(SCRIPT) $(PRIVATE_PATH)/.. $(PRIVATE_PATH)/va_version.h.in > $@
+$(GEN): $(LOCAL_PATH)/va_version.h.in $(LOCAL_PATH)/../build/gen_version.sh $(LOCAL_PATH)/../configure.ac
 	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN) 
+all_copied_headers: $(GEN)
 
 # For libva-android
 # =====================================================