Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust make files following libva #51

Merged
merged 1 commit into from
Sep 16, 2023
Merged

Adjust make files following libva #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _studio/enctools/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers
LOCAL_HEADER_LIBRARIES := libmfx_headers libva_headers


LOCAL_MODULE_TAGS := optional
Expand Down
2 changes: 0 additions & 2 deletions _studio/mfx_lib/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers

LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmfx_lib_merged_hw

Expand Down
5 changes: 0 additions & 5 deletions _studio/shared/asc/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,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_headers

LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libasc_avx2
include $(BUILD_STATIC_LIBRARY)
Expand All @@ -46,8 +44,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers

LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libasc_sse4
include $(BUILD_STATIC_LIBRARY)
Expand Down Expand Up @@ -82,7 +78,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers
LOCAL_WHOLE_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES)

LOCAL_MODULE_TAGS := optional
Expand Down
2 changes: 0 additions & 2 deletions _studio/shared/mfx_trace/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers

ifeq ($(MFX_ENABLE_ITT_TRACES),true)
LOCAL_STATIC_LIBRARIES += libittnotify
LOCAL_HEADER_LIBRARIES += llibittnotify_headers
Expand Down
4 changes: 0 additions & 4 deletions _studio/shared/umc/codec/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers

LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libumc_codecs_merged

Expand All @@ -71,8 +69,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers

LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libumc_codecs_merged_hw

Expand Down
2 changes: 0 additions & 2 deletions _studio/shared/umc/core/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers

LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libumc_core_merged_hw

Expand Down
2 changes: 0 additions & 2 deletions _studio/shared/umc/io/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers

LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libumc_io_merged_hw

Expand Down
4 changes: 2 additions & 2 deletions android/mfx_defs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

# =============================================================================
Expand Down Expand Up @@ -110,7 +110,7 @@ endif
# Setting usual paths to include files
MFX_INCLUDES := $(LOCAL_PATH)/include

MFX_INCLUDES_LIBVA := $(TARGET_OUT_HEADERS)/libva
LOCAL_HEADER_LIBRARIES := libmfx_headers libva_headers

# Setting usual link flags
MFX_LDFLAGS := \
Expand Down
1 change: 0 additions & 1 deletion android/mfx_defs_internal.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ MFX_INCLUDES_INTERNAL := \

MFX_INCLUDES_INTERNAL_HW := \
$(MFX_INCLUDES_INTERNAL) \
$(MFX_INCLUDES_LIBVA)
2 changes: 0 additions & 2 deletions api/mfx_dispatch/linux/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ LOCAL_CFLAGS_64 := \
$(MFX_CFLAGS_INTERNAL_64) \
-DMFX_MODULES_DIR=\"/system/vendor/lib64\"

LOCAL_HEADER_LIBRARIES := libmfx_headers

LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmfx

Expand Down
3 changes: 0 additions & 3 deletions samples/sample_common/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,11 @@ LOCAL_SRC_FILES := \

LOCAL_C_INCLUDES := \
$(MFX_INCLUDES) \
$(MFX_INCLUDES_LIBVA)

LOCAL_CFLAGS := \
$(MFX_CFLAGS) \
$(MFX_CFLAGS_LIBVA)

LOCAL_HEADER_LIBRARIES := libmfx_headers

LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libsample_common

Expand Down
2 changes: 0 additions & 2 deletions samples/sample_decode/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ LOCAL_SRC_FILES := $(addprefix src/, $(notdir $(wildcard $(LOCAL_PATH)/src/*.cpp

LOCAL_C_INCLUDES := \
$(MFX_INCLUDES) \
$(MFX_INCLUDES_LIBVA) \
$(MFX_HOME)/samples/sample_common/include

LOCAL_CFLAGS := \
Expand All @@ -17,7 +16,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers
LOCAL_STATIC_LIBRARIES := libsample_common libmfx
LOCAL_SHARED_LIBRARIES := libva libva-android

Expand Down
2 changes: 0 additions & 2 deletions samples/sample_encode/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ LOCAL_SRC_FILES := $(addprefix src/, $(notdir $(wildcard $(LOCAL_PATH)/src/*.cpp

LOCAL_C_INCLUDES := \
$(MFX_INCLUDES) \
$(MFX_INCLUDES_LIBVA) \
$(MFX_HOME)/samples/sample_common/include \
$(MFX_HOME)/samples/sample_plugins/rotate_cpu/include

Expand All @@ -18,7 +17,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers
LOCAL_STATIC_LIBRARIES := libsample_common libmfx
LOCAL_SHARED_LIBRARIES := libva libva-android

Expand Down
2 changes: 0 additions & 2 deletions samples/sample_multi_transcode/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ LOCAL_SRC_FILES := $(addprefix src/, $(notdir $(wildcard $(LOCAL_PATH)/src/*.cpp

LOCAL_C_INCLUDES := \
$(MFX_INCLUDES) \
$(MFX_INCLUDES_LIBVA) \
$(MFX_HOME)/samples/sample_common/include \
$(MFX_HOME)/samples/sample_plugins/vpp_plugin/include \
$(MFX_HOME)/samples/sample_plugins/rotate_cpu/include
Expand All @@ -19,7 +18,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers
LOCAL_STATIC_LIBRARIES := \
libsample_vpp_plugin \
libmfx \
Expand Down
1 change: 0 additions & 1 deletion samples/sample_plugins/vpp_plugin/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ LOCAL_CFLAGS := \
$(MFX_CFLAGS) \
$(MFX_CFLAGS_LIBVA)

LOCAL_HEADER_LIBRARIES := libmfx_headers
LOCAL_STATIC_LIBRARIES := libsample_common

LOCAL_MODULE_TAGS := optional
Expand Down
2 changes: 0 additions & 2 deletions samples/sample_vpp/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ LOCAL_SRC_FILES := $(addprefix src/, $(notdir $(wildcard $(LOCAL_PATH)/src/*.cpp

LOCAL_C_INCLUDES := \
$(MFX_INCLUDES) \
$(MFX_INCLUDES_LIBVA) \
$(MFX_HOME)/samples/sample_common/include

LOCAL_CFLAGS := \
Expand All @@ -17,7 +16,6 @@ LOCAL_CFLAGS := \
LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_HEADER_LIBRARIES := libmfx_headers
LOCAL_STATIC_LIBRARIES := libsample_common libmfx
LOCAL_SHARED_LIBRARIES := libva libva-android

Expand Down
Loading