From bbc066b3b91225edf214ace333ce68f943010fb4 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 28 Mar 2022 01:25:04 +0300
Subject: [PATCH] external libs, flac: added missing Android.mk after v1.3.4
upgrade.
---
external/flac-1.3.4.patch | 53 +++++++++++++++++++++++++++-
external/flac-1.3.4/Android.mk | 47 ++++++++++++++++++++++++
external/flac-1.3.4/android/config.h | 2 +-
3 files changed, 100 insertions(+), 2 deletions(-)
create mode 100644 external/flac-1.3.4/Android.mk
diff --git a/external/flac-1.3.4.patch b/external/flac-1.3.4.patch
index 6a50108d..54375199 100644
--- a/external/flac-1.3.4.patch
+++ b/external/flac-1.3.4.patch
@@ -55,7 +55,7 @@ diff -u /dev/null flac-1.3.4/android/config.h
+/* #undef FLAC__HAS_NASM */
+
+/* define if you have the ogg library */
-+#define FLAC__HAS_OGG 1
++#define FLAC__HAS_OGG 0
+
+/* define if compiler has __attribute__((target("cpu=power8"))) support */
+/* #undef FLAC__HAS_TARGET_POWER8 */
@@ -275,3 +275,54 @@ diff -u /dev/null flac-1.3.4/android/config.h
+
+/* Define to __typeof__ if your compiler spells it that way. */
+/* #undef typeof */
+diff -u /dev/null flac-1.3.4/Android.mk
+--- /dev/null
++++ flac-1.3.4/Android.mk
+@@ -0,0 +1,47 @@
++LOCAL_PATH := $(call my-dir)
++
++include $(CLEAR_VARS)
++
++LOCAL_MODULE := libFLAC
++
++LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \
++ $(LOCAL_PATH)/src/libFLAC/include
++
++LOCAL_CFLAGS := -include $(LOCAL_PATH)/android/config.h
++
++LOCAL_SRC_FILES := \
++ src/libFLAC/bitmath.c \
++ src/libFLAC/bitreader.c \
++ src/libFLAC/bitwriter.c \
++ src/libFLAC/cpu.c \
++ src/libFLAC/crc.c \
++ src/libFLAC/fixed.c \
++ src/libFLAC/fixed_intrin_sse2.c \
++ src/libFLAC/fixed_intrin_ssse3.c \
++ src/libFLAC/float.c \
++ src/libFLAC/format.c \
++ src/libFLAC/lpc.c \
++ src/libFLAC/lpc_intrin_sse.c \
++ src/libFLAC/lpc_intrin_sse2.c \
++ src/libFLAC/lpc_intrin_sse41.c \
++ src/libFLAC/lpc_intrin_avx2.c \
++ src/libFLAC/lpc_intrin_vsx.c \
++ src/libFLAC/md5.c \
++ src/libFLAC/memory.c \
++ src/libFLAC/metadata_iterators.c \
++ src/libFLAC/metadata_object.c \
++ src/libFLAC/stream_decoder.c \
++ src/libFLAC/stream_encoder.c \
++ src/libFLAC/stream_encoder_intrin_sse2.c \
++ 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)
++
++include $(BUILD_STATIC_LIBRARY)
diff --git a/external/flac-1.3.4/Android.mk b/external/flac-1.3.4/Android.mk
new file mode 100644
index 00000000..dd01b88b
--- /dev/null
+++ b/external/flac-1.3.4/Android.mk
@@ -0,0 +1,47 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libFLAC
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \
+ $(LOCAL_PATH)/src/libFLAC/include
+
+LOCAL_CFLAGS := -include $(LOCAL_PATH)/android/config.h
+
+LOCAL_SRC_FILES := \
+ src/libFLAC/bitmath.c \
+ src/libFLAC/bitreader.c \
+ src/libFLAC/bitwriter.c \
+ src/libFLAC/cpu.c \
+ src/libFLAC/crc.c \
+ src/libFLAC/fixed.c \
+ src/libFLAC/fixed_intrin_sse2.c \
+ src/libFLAC/fixed_intrin_ssse3.c \
+ src/libFLAC/float.c \
+ src/libFLAC/format.c \
+ src/libFLAC/lpc.c \
+ src/libFLAC/lpc_intrin_sse.c \
+ src/libFLAC/lpc_intrin_sse2.c \
+ src/libFLAC/lpc_intrin_sse41.c \
+ src/libFLAC/lpc_intrin_avx2.c \
+ src/libFLAC/lpc_intrin_vsx.c \
+ src/libFLAC/md5.c \
+ src/libFLAC/memory.c \
+ src/libFLAC/metadata_iterators.c \
+ src/libFLAC/metadata_object.c \
+ src/libFLAC/stream_decoder.c \
+ src/libFLAC/stream_encoder.c \
+ src/libFLAC/stream_encoder_intrin_sse2.c \
+ 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)
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/external/flac-1.3.4/android/config.h b/external/flac-1.3.4/android/config.h
index 68ce4179..7d531feb 100644
--- a/external/flac-1.3.4/android/config.h
+++ b/external/flac-1.3.4/android/config.h
@@ -38,7 +38,7 @@
/* #undef FLAC__HAS_NASM */
/* define if you have the ogg library */
-#define FLAC__HAS_OGG 1
+#define FLAC__HAS_OGG 0
/* define if compiler has __attribute__((target("cpu=power8"))) support */
/* #undef FLAC__HAS_TARGET_POWER8 */