Skip to content

Fixes for NDK 20 #98

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes for NDK 20 #98

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
1 change: 1 addition & 0 deletions decoder/jni/aac-decoder/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ LOCAL_MODULE := aacdecoder
LOCAL_SRC_FILES := aac-decoder.c
LOCAL_CFLAGS := $(cflags_loglevels)
LOCAL_LDLIBS := -llog
LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
LOCAL_STATIC_LIBRARIES := decoder-opencore-aacdec decoder-opencore-mp3dec libpv_aac_dec libpv_mp3_dec
include $(BUILD_SHARED_LIBRARY)

Expand Down
3 changes: 1 addition & 2 deletions decoder/jni/opencore-aacdec/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ LOCAL_SRC_FILES := \
src/get_adif_header.cpp \
src/get_adts_header.cpp \
src/get_audio_specific_config.cpp \
src/get_cce.cpp \
src/get_dse.cpp \
src/get_ele_list.cpp \
src/get_ga_specific_config.cpp \
Expand Down Expand Up @@ -175,7 +174,7 @@ PV_CFLAGS :=
# Unfortunately PS causes crash for certain streams:
# fixed 2012-06-28
#LOCAL_CFLAGS := -DAAC_PLUS -DHQ_SBR $(PV_CFLAGS)
LOCAL_CFLAGS := -DAAC_PLUS -DHQ_SBR -DPARAMETRICSTEREO $(PV_CFLAGS)
LOCAL_CFLAGS := -Wno-narrowing -DAAC_PLUS -DHQ_SBR -DPARAMETRICSTEREO $(PV_CFLAGS)

ifeq ($(TARGET_ARCH),arm)
LOCAL_ARM_MODE := arm
Expand Down