diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2017-04-06 10:27:28 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2017-06-12 09:41:00 +0800 |
| commit | 06fe47bf4fef9628f8d1588f5c39490159fcb947 (patch) | |
| tree | e600415667d62f41ad1f384327c8d40d7d8ba44b | |
| parent | ba31a1d9bf4a7dfe6e17d515a3ae96179e97e450 (diff) | |
| download | libva-06fe47bf4fef9628f8d1588f5c39490159fcb947.tar.gz | |
android: use LOCAL_EXPORT_C_INCLUDE_DIRS to get include paths
The documents of Android build system explicitly said LOCAL_COPY_HEADERS
and LOCAL_COPY_HEADERS_TO are deprecated.
Replace them by the LOCAL_EXPORT_C_INCLUDE_DIRS variable. The modules
that use libva will get the include path automatically.
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
(cherry picked from commit 0f021eb30657fbcf8c46e9585ea975a317263fd5)
| -rwxr-xr-x | va/Android.mk | 48 |
1 files changed, 5 insertions, 43 deletions
diff --git a/va/Android.mk b/va/Android.mk index 05e1541..b70b657 100755 --- a/va/Android.mk +++ b/va/Android.mk @@ -60,25 +60,7 @@ else LOCAL_CFLAGS += -DANDROID_LOG endif -LOCAL_C_INCLUDES += \ - $(TARGET_OUT_HEADERS)/libva \ - $(LOCAL_PATH)/x11 \ - $(LOCAL_PATH)/.. - -LOCAL_COPY_HEADERS := \ - va.h \ - va_backend.h \ - va_dec_hevc.h \ - va_dec_jpeg.h \ - va_drmcommon.h \ - va_enc_hevc.h \ - va_enc_jpeg.h \ - va_enc_vp8.h \ - va_enc_vp9.h \ - va_dec_vp9.h \ - va_version.h - -LOCAL_COPY_HEADERS_TO := libva/va +LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libva @@ -88,6 +70,10 @@ LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils liblog intermediates := $(call local-generated-sources-dir) +LOCAL_EXPORT_C_INCLUDE_DIRS := \ + $(intermediates) \ + $(LOCAL_C_INCLUDES) + GEN := $(intermediates)/va/va_version.h $(GEN): SCRIPT := $(LOCAL_PATH)/../build/gen_version.sh $(GEN): PRIVATE_CUSTOM_TOOL = sh $(SCRIPT) $(<D)/.. $< > $@ @@ -110,14 +96,8 @@ LOCAL_CFLAGS += \ -DANDROID -DLOG_TAG=\"libva-android\" LOCAL_C_INCLUDES += \ - $(TARGET_OUT_HEADERS)/libva \ - $(TARGET_OUT_HEADERS)/libdrm \ $(LOCAL_PATH)/drm -LOCAL_COPY_HEADERS_TO := libva/va - -LOCAL_COPY_HEADERS := va_android.h - LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libva-android @@ -137,14 +117,6 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS += \ -DANDROID -DLOG_TAG=\"libva-egl\" -LOCAL_C_INCLUDES += \ - $(TARGET_OUT_HEADERS)/libva \ - $(LOCAL_PATH)/x11 - -LOCAL_COPY_HEADERS_TO := libva/va - -LOCAL_COPY_HEADERS := egl/va_egl.h egl/va_backend_egl.h - LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libva-egl @@ -162,16 +134,6 @@ LOCAL_SRC_FILES := va_tpi.c LOCAL_CFLAGS += -DANDROID -DLOG_TAG=\"libva-tpi\" -LOCAL_C_INCLUDES += \ - $(TARGET_OUT_HEADERS)/libva \ - $(LOCAL_PATH)/.. - -LOCAL_COPY_HEADERS_TO := libva/va - -LOCAL_COPY_HEADERS := \ - va_tpi.h \ - va_backend_tpi.h - LOCAL_SHARED_LIBRARIES := libva LOCAL_MODULE_TAGS := optional |