From 0aaafacbc9183eadc03a46b7cc0aea1538ea1dc8 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sun, 22 Oct 2017 17:29:07 -0700
Subject: [PATCH] Fixed building for Android armeabi

---
 Android.mk                              | 3 ++-
 external/libvorbisidec-1.2.1.patch      | 4 ++--
 external/libvorbisidec-1.2.1/Android.mk | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Android.mk b/Android.mk
index 966e1cc9..84c6e8dd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -60,6 +60,7 @@ LOCAL_MODULE := SDL2_mixer
 
 LOCAL_SRC_FILES := $(notdir $(filter-out %/playmus.c %/playwave.c, $(wildcard $(LOCAL_PATH)/*.c))) \
 
+LOCAL_CFLAGS :=
 LOCAL_LDLIBS :=
 LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := SDL2
@@ -97,6 +98,6 @@ ifeq ($(SUPPORT_TIMIDITY),true)
 	LOCAL_STATIC_LIBRARIES += timidity
 endif
 
-LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/external/libvorbisidec-1.2.1.patch b/external/libvorbisidec-1.2.1.patch
index bcc9d8cd..3ee2b602 100644
--- a/external/libvorbisidec-1.2.1.patch
+++ b/external/libvorbisidec-1.2.1.patch
@@ -1,6 +1,6 @@
 diff -ruN libvorbisidec-1.2.1.orig/Android.mk libvorbisidec-1.2.1/Android.mk
 --- libvorbisidec-1.2.1.orig/Android.mk	1969-12-31 16:00:00.000000000 -0800
-+++ libvorbisidec-1.2.1/Android.mk	2017-10-22 11:49:09.948298409 -0700
++++ libvorbisidec-1.2.1/Android.mk	2017-10-22 17:27:12.176911197 -0700
 @@ -0,0 +1,32 @@
 +LOCAL_PATH := $(call my-dir)
 +
@@ -35,7 +35,7 @@ diff -ruN libvorbisidec-1.2.1.orig/Android.mk libvorbisidec-1.2.1/Android.mk
 +
 +include $(BUILD_STATIC_LIBRARY)
 diff -ruN libvorbisidec-1.2.1.orig/misc.h libvorbisidec-1.2.1/misc.h
---- libvorbisidec-1.2.1.orig/misc.h	2017-10-22 11:25:03.341817045 -0700
+--- libvorbisidec-1.2.1.orig/misc.h	2017-10-22 17:26:08.725205666 -0700
 +++ libvorbisidec-1.2.1/misc.h	2017-10-12 20:05:06.719770194 -0700
 @@ -30,6 +30,7 @@
  
diff --git a/external/libvorbisidec-1.2.1/Android.mk b/external/libvorbisidec-1.2.1/Android.mk
index 7b5fc56b..0370f091 100644
--- a/external/libvorbisidec-1.2.1/Android.mk
+++ b/external/libvorbisidec-1.2.1/Android.mk
@@ -13,19 +13,19 @@ ifeq ($(TARGET_ARCH),arm)
 endif
 
 LOCAL_SRC_FILES += \
-    mdct.c \
+    mdct.c.arm \
     block.c \
-    window.c \
+    window.c.arm \
     synthesis.c \
     info.c \
-    floor1.c \
+    floor1.c.arm \
     floor0.c.arm \
     vorbisfile.c.arm \
     res012.c \
     mapping0.c \
     registry.c \
     codebook.c \
-    sharedbook.c \
+    sharedbook.c.arm \
 
 LOCAL_SHARED_LIBRARIES := ogg