SDL_mixer: external libs, flac: Android.mk fixing...

From 9425f0e422e1b2dea3d8e9a43f69c2209ba8e2bc Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 28 Mar 2022 01:56:56 +0300
Subject: [PATCH] external libs, flac: Android.mk fixing...

---
 external/flac-1.3.4.patch      | 19 ++++++++++---------
 external/flac-1.3.4/Android.mk | 17 +++++++++--------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/external/flac-1.3.4.patch b/external/flac-1.3.4.patch
index 54375199..ed669519 100644
--- a/external/flac-1.3.4.patch
+++ b/external/flac-1.3.4.patch
@@ -278,7 +278,7 @@ diff -u /dev/null flac-1.3.4/android/config.h
 diff -u /dev/null flac-1.3.4/Android.mk
 --- /dev/null
 +++ flac-1.3.4/Android.mk
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,48 @@
 +LOCAL_PATH := $(call my-dir)
 +
 +include $(CLEAR_VARS)
@@ -287,7 +287,10 @@ diff -u /dev/null flac-1.3.4/Android.mk
 +
 +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \
 +                    $(LOCAL_PATH)/src/libFLAC/include
-+
++#FLAC_OGG_LIBRARY_PATH := ../libogg-1.3.2
++#LOCAL_C_INCLUDES+= $(LOCAL_PATH)/$(FLAC_OGG_LIBRARY_PATH)/include \
++#                   $(LOCAL_PATH)/$(FLAC_OGG_LIBRARY_PATH)/android
++LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
 +LOCAL_CFLAGS := -include $(LOCAL_PATH)/android/config.h
 +
 +LOCAL_SRC_FILES := \
@@ -317,12 +320,10 @@ diff -u /dev/null flac-1.3.4/Android.mk
 +    src/libFLAC/stream_encoder_intrin_ssse3.c \
 +    src/libFLAC/stream_encoder_intrin_avx2.c  \
 +    src/libFLAC/stream_encoder_framing.c \
-+    src/libFLAC/window.c \
-+    src/libFLAC/ogg_decoder_aspect.c \
-+    src/libFLAC/ogg_encoder_aspect.c \
-+    src/libFLAC/ogg_helper.c \
-+    src/libFLAC/ogg_mapping.c
-+
-+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
++    src/libFLAC/window.c
++#   src/libFLAC/ogg_decoder_aspect.c
++#   src/libFLAC/ogg_encoder_aspect.c
++#   src/libFLAC/ogg_helper.c
++#   src/libFLAC/ogg_mapping.c
 +
 +include $(BUILD_STATIC_LIBRARY)
diff --git a/external/flac-1.3.4/Android.mk b/external/flac-1.3.4/Android.mk
index dd01b88b..331a76d6 100644
--- a/external/flac-1.3.4/Android.mk
+++ b/external/flac-1.3.4/Android.mk
@@ -6,7 +6,10 @@ LOCAL_MODULE := libFLAC
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \
                     $(LOCAL_PATH)/src/libFLAC/include
-
+#FLAC_OGG_LIBRARY_PATH := ../libogg-1.3.2
+#LOCAL_C_INCLUDES+= $(LOCAL_PATH)/$(FLAC_OGG_LIBRARY_PATH)/include \
+#                   $(LOCAL_PATH)/$(FLAC_OGG_LIBRARY_PATH)/android
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
 LOCAL_CFLAGS := -include $(LOCAL_PATH)/android/config.h
 
 LOCAL_SRC_FILES := \
@@ -36,12 +39,10 @@ LOCAL_SRC_FILES := \
     src/libFLAC/stream_encoder_intrin_ssse3.c \
     src/libFLAC/stream_encoder_intrin_avx2.c  \
     src/libFLAC/stream_encoder_framing.c \
-    src/libFLAC/window.c \
-    src/libFLAC/ogg_decoder_aspect.c \
-    src/libFLAC/ogg_encoder_aspect.c \
-    src/libFLAC/ogg_helper.c \
-    src/libFLAC/ogg_mapping.c
-
-LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
+    src/libFLAC/window.c
+#   src/libFLAC/ogg_decoder_aspect.c
+#   src/libFLAC/ogg_encoder_aspect.c
+#   src/libFLAC/ogg_helper.c
+#   src/libFLAC/ogg_mapping.c
 
 include $(BUILD_STATIC_LIBRARY)