diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-11 17:55:01 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-05-11 18:02:02 -0700 |
| commit | d4263977a574b872ced962588fa431e971e486b6 (patch) | |
| tree | 203554936652e9441ad97101a22e4cecb984c0aa /va | |
| parent | b9e665199e029e9e34341ad7f22d4ce156e6cb79 (diff) | |
| download | libva-d4263977a574b872ced962588fa431e971e486b6.tar.gz | |
Really fix the readonly source caseandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
Some libraries were already only using the headers through
LOCAL_EXPORT_C_INCLUDE_DIRS, which meant when I stopped generating it
in the source tree, they no longer had access to it. My local testing
didn't catch it because I had a stale version in my source tree hidden
with a .gitignore entry.
Instead, generate this file into the generated sources directory for
libva, export that include path as well, then set it up to be copied
into the global header directory.
Change-Id: If2aa8ea443ddb81e7f7a9dc2d7b2f5363c6e4fd0
Diffstat (limited to 'va')
| -rwxr-xr-x | va/Android.mk | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/va/Android.mk b/va/Android.mk index c8af633..8012005 100755 --- a/va/Android.mk +++ b/va/Android.mk @@ -34,6 +34,11 @@ LIBVA_DRIVERS_PATH = /system/lib include $(CLEAR_VARS) +LOCAL_MODULE := libva +LOCAL_MODULE_CLASS := SHARED_LIBRARIES + +generated_sources_dir := $(call local-generated-sources-dir) + LOCAL_SRC_FILES := \ va.c \ va_trace.c \ @@ -47,7 +52,7 @@ LOCAL_CFLAGS := \ -DLOG_TAG=\"libva\" \ -DANDROID_ALOG -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/.. +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/.. $(generated_sources_dir) LOCAL_C_INCLUDES := \ $(TARGET_OUT_HEADERS)/libva \ @@ -72,20 +77,23 @@ LOCAL_COPY_HEADERS := \ LOCAL_COPY_HEADERS_TO := libva/va LOCAL_CFLAGS += -Werror -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libva LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils liblog -include $(BUILD_SHARED_LIBRARY) - -GEN := $(TARGET_OUT_HEADERS)/libva/va/va_version.h +GEN := $(generated_sources_dir)/va/va_version.h $(GEN): SCRIPT := $(LOCAL_PATH)/../build/gen_version.sh $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(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) -all_copied_headers: $(GEN) +LOCAL_GENERATED_SOURCES := $(GEN) + +include $(BUILD_SHARED_LIBRARY) + +my_header := $(TARGET_OUT_HEADERS)/libva/va/va_version.h +ALL_COPIED_HEADERS.$(my_header).MAKEFILE += $(my_header) +ALL_COPIED_HEADERS.$(my_header).SRC += $(GEN) +ALL_COPIED_HEADERS += $(my_header) # For libva-android # ===================================================== |