From de891080a5d19658dbda798bf31e9dfc97eac629 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Tue, 3 Mar 2026 15:46:10 -0500
Subject: [PATCH] android: Added Opus support to Android.mk.
Fixes #805.
---
Android.mk | 19 +++++++++++++++++++
external/opus | 2 +-
external/opusfile | 2 +-
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/Android.mk b/Android.mk
index 092771fa..f4d3f1fd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,6 +45,11 @@ XMP_LIBRARY_PATH := external/libxmp
SUPPORT_MID_TIMIDITY ?= false
TIMIDITY_LIBRARY_PATH := src/timidity
+# Enable this if you want to support Opus via libopus
+SUPPORT_OPUS ?= false
+OPUS_LIBRARY_PATH := external/opus
+OPUSFILE_LIBRARY_PATH := external/opusfile
+
# Make sure we don't build both libtremor and libvorbis. Different implementations of same API.
ifeq ($(SUPPORT_VORBIS_LIBTREMOR),true)
@@ -108,6 +113,12 @@ ifeq ($(SUPPORT_MID_TIMIDITY),true)
include $(SDL_MIXER_LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)/Android.mk
endif
+# Build the library
+ifeq ($(SUPPORT_OPUS),true)
+ include $(SDL_MIXER_LOCAL_PATH)/$(OPUS_LIBRARY_PATH)/Android.mk
+ include $(SDL_MIXER_LOCAL_PATH)/$(OPUSFILE_LIBRARY_PATH)/Android.mk
+endif
+
# Restore local path
LOCAL_PATH := $(SDL_MIXER_LOCAL_PATH)
@@ -196,6 +207,14 @@ ifeq ($(SUPPORT_MID_TIMIDITY),true)
LOCAL_STATIC_LIBRARIES += timidity
endif
+ifeq ($(SUPPORT_OPUS),true)
+ LOCAL_CFLAGS += -DDECODER_OPUS
+ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(OPUS_LIBRARY_PATH)/include
+ LOCAL_STATIC_LIBRARIES += opus
+ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(OPUSFILE_LIBRARY_PATH)/include
+ LOCAL_STATIC_LIBRARIES += opusfile
+endif
+
LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/include
include $(BUILD_SHARED_LIBRARY)
diff --git a/external/opus b/external/opus
index e6fd7f5d..ac9f053e 160000
--- a/external/opus
+++ b/external/opus
@@ -1 +1 @@
-Subproject commit e6fd7f5d1fe41d36033980efe2809d8c2cc0f320
+Subproject commit ac9f053e1db9cc1c7608b74e029c25ded0254e3e
diff --git a/external/opusfile b/external/opusfile
index 7d26ff56..840684e7 160000
--- a/external/opusfile
+++ b/external/opusfile
@@ -1 +1 @@
-Subproject commit 7d26ff56278aa6cd7f2a5046498932e838f0ea3a
+Subproject commit 840684e76b69ef2221b28402e7c21f4c586e6ae4