diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-10 15:57:50 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-05-10 16:06:12 -0700 |
| commit | b9e665199e029e9e34341ad7f22d4ce156e6cb79 (patch) | |
| tree | 59ee603b5a86af2c49d438d68a12297008d2e7d1 | |
| parent | bb5b2001f9093d0c6e50639bc98db15b0418ef43 (diff) | |
| download | libva-b9e665199e029e9e34341ad7f22d4ce156e6cb79.tar.gz | |
Fix builds with readonly source directories
The source directory should not be written to. So instead of writing to
a local file, then copying it to the output headers, generate it
directly to the output header directory.
This really should be using LOCAL_EXPORT_C_INCLUDE_DIRS instead of using
copy headers, but that's a much larger change.
Change-Id: I6d6a542459e587224fb7bc469a332addc8893436
| -rwxr-xr-x | va/Android.mk | 9 |
1 files changed, 4 insertions, 5 deletions
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_C_INCLUDES := \ LOCAL_COPY_HEADERS := \ va.h \ - va_version.h \ va_dec_hevc.h \ va_dec_jpeg.h \ va_dec_vp8.h \ @@ -80,13 +79,13 @@ LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils liblog 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 # ===================================================== |