From cf3dfb72a2301be5d3652a50c576ea2c1f25fec6 Mon Sep 17 00:00:00 2001
From: Bruno Van de Velde <vdv_b@tgui.eu>
Date: Sat, 11 Nov 2023 10:58:56 +0100
Subject: [PATCH] Removed support for ndk-build on Android (in favor of CMake)

---
 CMakeLists.txt      |   4 -
 extlibs/Android.mk  |  13 ----
 src/SFML/Android.mk | 183 --------------------------------------------
 3 files changed, 200 deletions(-)
 delete mode 100644 extlibs/Android.mk
 delete mode 100644 src/SFML/Android.mk

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd7b180d9..345654850 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -477,12 +477,8 @@ elseif(SFML_OS_ANDROID)
     if(NOT SFML_USE_SYSTEM_DEPS)
         # install extlibs
         install(DIRECTORY extlibs/libs-android/${CMAKE_ANDROID_ARCH_ABI} DESTINATION extlibs/lib)
-        install(FILES extlibs/Android.mk DESTINATION extlibs)
     endif()
 
-    # install Android.mk so the NDK knows how to set up SFML
-    install(FILES src/SFML/Android.mk DESTINATION .)
-
 endif()
 
 sfml_export_targets()
diff --git a/extlibs/Android.mk b/extlibs/Android.mk
deleted file mode 100644
index 26d966b5d..000000000
--- a/extlibs/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := freetype
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libfreetype.a
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := openal
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libopenal.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
diff --git a/src/SFML/Android.mk b/src/SFML/Android.mk
deleted file mode 100644
index 2c3a6267f..000000000
--- a/src/SFML/Android.mk
+++ /dev/null
@@ -1,183 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-system
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-system.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-window
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-window.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_EXPORT_LDLIBS := -lEGL -llog -landroid
-LOCAL_SHARED_LIBRARIES := sfml-system
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-graphics
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-graphics.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES += sfml-system sfml-window
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-audio
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := sfml-window sfml-system openal
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-network
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-network.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := sfml-system
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-main
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-main.a
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := sfml-window sfml-system
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_STATIC_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-activity
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-activity.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-system-d
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-system-d.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-window-d
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-window-d.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_EXPORT_LDLIBS := -lEGL -llog -landroid
-LOCAL_SHARED_LIBRARIES := sfml-system-d
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-graphics-d
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-graphics-d.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES += sfml-system-d sfml-window-d
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-audio-d
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-audio-d.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := sfml-window-d sfml-system-d openal
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-network-d
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-network-d.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := sfml-system-d
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-main-d
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-main-d.a
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := sfml-window-d sfml-system-d
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_STATIC_LIBRARY)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := sfml-activity-d
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libsfml-activity-d.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-
-prebuilt_path := $(call local-prebuilt-path,$(LOCAL_SRC_FILES))
-prebuilt := $(strip $(wildcard $(prebuilt_path)))
-
-ifdef prebuilt
-    include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-$(call import-module,third_party/sfml/extlibs)
-