From f8d0890519cb64070aec2cbbf97b5da2b3efcd6d Mon Sep 17 00:00:00 2001
From: Miku AuahDark <auahdark687291@gmail.com>
Date: Thu, 4 Jul 2019 12:53:44 +0800
Subject: [PATCH] Cleanup ogg-family (vorbis, theora) includes.

This means only SDL remains that has paths hardcoded.
---
 love/src/jni/libtheora-1.2.0alpha1/Android.mk | 2 ++
 love/src/jni/libvorbis-1.3.5/Android.mk       | 9 +++++----
 love/src/jni/love/Android.mk                  | 5 +----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/love/src/jni/libtheora-1.2.0alpha1/Android.mk b/love/src/jni/libtheora-1.2.0alpha1/Android.mk
index 4e335ee6..ec290ddd 100644
--- a/love/src/jni/libtheora-1.2.0alpha1/Android.mk
+++ b/love/src/jni/libtheora-1.2.0alpha1/Android.mk
@@ -51,4 +51,6 @@ else ifeq ($(TARGET_ARCH_ABI),x86_64)
         lib/x86/x86state.c
 endif
 
+LOCAL_STATIC_LIBRARIES := libogg
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/love/src/jni/libvorbis-1.3.5/Android.mk b/love/src/jni/libvorbis-1.3.5/Android.mk
index c1a9c625..2f3d658f 100644
--- a/love/src/jni/libvorbis-1.3.5/Android.mk
+++ b/love/src/jni/libvorbis-1.3.5/Android.mk
@@ -1,15 +1,14 @@
 LOCAL_PATH:= $(call my-dir)
 
-# libogg
+# libvorbis
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := libvorbis
 LOCAL_CFLAGS    := -fexceptions -g -Dlinux -DHAVE_GCC_DESTRUCTOR=1 -DOPT_GENERIC -DREAL_IS_FLOAT
 LOCAL_CPPFLAGS  := ${LOCAL_CFLAGS}
 
-LOCAL_C_INCLUDES  :=  \
-	${LOCAL_PATH}/../libogg-1.3.2/include \
-	${LOCAL_PATH}/include
+LOCAL_C_INCLUDES := ${LOCAL_PATH}/include
+LOCAL_EXPORT_C_INCLUDES := ${LOCAL_C_INCLUDES}
 		
 LOCAL_SRC_FILES := \
 	$(filter-out lib/psytune.c lib/vorbisenc.c, $(subst $(LOCAL_PATH)/,,\
@@ -18,4 +17,6 @@ LOCAL_SRC_FILES := \
 # $(info libvorbis: include dirs $(LOCAL_C_INCLUDES))
 # $(info libvorbis: src files $(LOCAL_SRC_FILES))
 
+LOCAL_STATIC_LIBRARIES := libogg
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/love/src/jni/love/Android.mk b/love/src/jni/love/Android.mk
index 9eea4f83..574e6338 100644
--- a/love/src/jni/love/Android.mk
+++ b/love/src/jni/love/Android.mk
@@ -23,10 +23,7 @@ LOCAL_C_INCLUDES  :=  \
 	${LOCAL_PATH}/src/libraries/ \
 	${LOCAL_PATH}/src/libraries/enet/libenet/include \
 	${LOCAL_PATH}/src/libraries/physfs \
-	${LOCAL_PATH}/src/libraries/glslang/glslang/Include \
-	${LOCAL_PATH}/../libvorbis-1.3.5/include \
-	${LOCAL_PATH}/../libogg-1.3.2/include \
-	${LOCAL_PATH}/../libtheora-1.2.0alpha1/include 
+	${LOCAL_PATH}/src/libraries/glslang/glslang/Include
 
 LOCAL_SRC_FILES := \
 	$(filter-out \