From 60f5f9f3d706ff99b3386bc262669fdf845b7ca3 Mon Sep 17 00:00:00 2001 From: zhangyichix Date: Wed, 23 Aug 2023 14:46:31 +0800 Subject: [PATCH] Adjust make files following libva * mv LOCAL_HEADER_LIBRARIES to mfx_defs * add libva_headers * LOCAL_COPY_HEADERS_TO is deprecated, adjust include path Tracked-On: OAM-111850 Signed-off-by: zhangyichix --- _studio/mfx_lib/Android.mk | 3 --- _studio/mfx_lib/shared/src/libmfxsw.cpp | 2 +- _studio/shared/asc/Android.mk | 5 ----- _studio/shared/mfx_logging/Android.mk | 2 -- _studio/shared/mfx_trace/Android.mk | 2 -- _studio/shared/src/libmfx_core_vaapi.cpp | 2 +- _studio/shared/umc/codec/Android.mk | 3 --- _studio/shared/umc/core/Android.mk | 1 - _studio/shared/umc/io/Android.mk | 2 -- android/mfx_defs.mk | 4 ++-- android/mfx_defs_internal.mk | 1 - 11 files changed, 4 insertions(+), 23 deletions(-) diff --git a/_studio/mfx_lib/Android.mk b/_studio/mfx_lib/Android.mk index 90948048..733c71d7 100644 --- a/_studio/mfx_lib/Android.mk +++ b/_studio/mfx_lib/Android.mk @@ -301,8 +301,6 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32) LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers - LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libmfx_core_hw LOCAL_SHARED_LIBRARIES := liblog libcutils @@ -329,7 +327,6 @@ LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) LOCAL_LDFLAGS := $(MFX_LOCAL_LDFLAGS_HW) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers LOCAL_WHOLE_STATIC_LIBRARIES := $(MFX_LOCAL_STATIC_LIBRARIES_HW) LOCAL_SHARED_LIBRARIES := libva liblog libcutils libdrm diff --git a/_studio/mfx_lib/shared/src/libmfxsw.cpp b/_studio/mfx_lib/shared/src/libmfxsw.cpp index 8dfe489f..e51e1601 100644 --- a/_studio/mfx_lib/shared/src/libmfxsw.cpp +++ b/_studio/mfx_lib/shared/src/libmfxsw.cpp @@ -31,7 +31,7 @@ #include #include #include -#include "va/va_drm.h" +#include "va/drm/va_drm.h" #include "mediasdk_version.h" #include "libmfx_core_factory.h" diff --git a/_studio/shared/asc/Android.mk b/_studio/shared/asc/Android.mk index 38e1960c..03c8063a 100644 --- a/_studio/shared/asc/Android.mk +++ b/_studio/shared/asc/Android.mk @@ -23,8 +23,6 @@ LOCAL_CFLAGS += -I $(MFX_HOME)/_studio/shared/asc/include/ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32) LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers - LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libmfx_asc_avx2 include $(BUILD_STATIC_LIBRARY) @@ -50,8 +48,6 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32) LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers - LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libmfx_asc_sse4 include $(BUILD_STATIC_LIBRARY) @@ -88,7 +84,6 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32) LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers LOCAL_WHOLE_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) LOCAL_MODULE_TAGS := optional diff --git a/_studio/shared/mfx_logging/Android.mk b/_studio/shared/mfx_logging/Android.mk index 4951c49c..93f6fc38 100644 --- a/_studio/shared/mfx_logging/Android.mk +++ b/_studio/shared/mfx_logging/Android.mk @@ -17,8 +17,6 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32) LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers - LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libmfx_logging diff --git a/_studio/shared/mfx_trace/Android.mk b/_studio/shared/mfx_trace/Android.mk index f1411169..93c71ffd 100644 --- a/_studio/shared/mfx_trace/Android.mk +++ b/_studio/shared/mfx_trace/Android.mk @@ -17,8 +17,6 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32) LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers - LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libmfx_gen_trace diff --git a/_studio/shared/src/libmfx_core_vaapi.cpp b/_studio/shared/src/libmfx_core_vaapi.cpp index 7b215e80..f00a7450 100644 --- a/_studio/shared/src/libmfx_core_vaapi.cpp +++ b/_studio/shared/src/libmfx_core_vaapi.cpp @@ -44,7 +44,7 @@ #include "va/va.h" #include -#include "va/va_drm.h" +#include "va/drm/va_drm.h" #include #include diff --git a/_studio/shared/umc/codec/Android.mk b/_studio/shared/umc/codec/Android.mk index 1c29ae56..7e4cf270 100644 --- a/_studio/shared/umc/codec/Android.mk +++ b/_studio/shared/umc/codec/Android.mk @@ -40,7 +40,6 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32) LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional @@ -76,8 +75,6 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32) LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers - LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional diff --git a/_studio/shared/umc/core/Android.mk b/_studio/shared/umc/core/Android.mk index 75d1ce3f..aedbfe82 100644 --- a/_studio/shared/umc/core/Android.mk +++ b/_studio/shared/umc/core/Android.mk @@ -32,7 +32,6 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32) LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers LOCAL_STATIC_LIBRARIES += libmfx_logging LOCAL_MODULE_TAGS := optional diff --git a/_studio/shared/umc/io/Android.mk b/_studio/shared/umc/io/Android.mk index e28259ae..0baf70d8 100644 --- a/_studio/shared/umc/io/Android.mk +++ b/_studio/shared/umc/io/Android.mk @@ -29,8 +29,6 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32) LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64) -LOCAL_HEADER_LIBRARIES := libmfx_gen_headers - LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libumc_va diff --git a/android/mfx_defs.mk b/android/mfx_defs.mk index 2f93b8b9..2742d812 100644 --- a/android/mfx_defs.mk +++ b/android/mfx_defs.mk @@ -5,7 +5,7 @@ # MFX_CFLAGS - common flags for all targets # MFX_CFLAGS_LIBVA - LibVA support flags (to build apps with or without LibVA support) # MFX_INCLUDES - common include paths for all targets -# MFX_INCLUDES_LIBVA - include paths to LibVA headers +# libva_headers - include paths to LibVA headers # MFX_LDFLAGS - common link flags for all targets # ============================================================================= @@ -90,7 +90,7 @@ endif # Setting usual paths to include files MFX_INCLUDES := $(LOCAL_PATH)/include -MFX_INCLUDES_LIBVA := $(TARGET_OUT_HEADERS)/libva +LOCAL_HEADER_LIBRARIES := libmfx_gen_headers libva_headers # Setting usual link flags MFX_LDFLAGS := \ diff --git a/android/mfx_defs_internal.mk b/android/mfx_defs_internal.mk index 8d5ef227..334d2cbb 100644 --- a/android/mfx_defs_internal.mk +++ b/android/mfx_defs_internal.mk @@ -49,4 +49,3 @@ MFX_INCLUDES_INTERNAL := \ MFX_INCLUDES_INTERNAL_HW := \ $(MFX_INCLUDES_INTERNAL) \ - $(MFX_INCLUDES_LIBVA)