From b3efb7733464dc28948b2a97b9c1c83a99af0cbd Mon Sep 17 00:00:00 2001
From: ROllerozxa <rollerozxa@voxelmanip.se>
Date: Mon, 11 Mar 2024 20:44:22 +0100
Subject: [PATCH] Switch Android build system to use CMake

---
 CMakeLists.txt                                | 173 ++++++++++++++----
 build-android/.gitignore                      |   1 +
 build-android/build.gradle                    |   4 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 build-android/jni                             |   1 -
 build-android/principia/build.gradle          |   7 +-
 .../main/java/org/libsdl/app/SDLActivity.java |   6 +-
 cmake/Modules/PrincipiaAndroidLibs.cmake      |  11 ++
 src/Android.mk                                | 104 -----------
 src/Application.mk                            |   4 -
 src/SDL_image/Android.mk                      |   4 -
 src/SDL_mixer/Android.mk                      |   1 -
 src/lua/Android.mk                            |  31 ----
 src/src/Android.mk                            |  13 --
 src/tms/Android.mk                            |   8 -
 15 files changed, 162 insertions(+), 208 deletions(-)
 delete mode 120000 build-android/jni
 create mode 100644 cmake/Modules/PrincipiaAndroidLibs.cmake
 delete mode 100644 src/Android.mk
 delete mode 100644 src/Application.mk
 delete mode 100644 src/SDL_image/Android.mk
 delete mode 100644 src/SDL_mixer/Android.mk
 delete mode 100644 src/lua/Android.mk
 delete mode 100644 src/src/Android.mk
 delete mode 100644 src/tms/Android.mk

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1932f3358..b146434db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,14 +13,31 @@ if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+
+
+# Find core dependencies
+# ----------------------
+
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.20)
+	include(PrincipiaAndroidLibs)
+
+else()
+	find_package(SDL2 REQUIRED)
+
+	set(OpenGL_GL_PREFERENCE GLVND)
+	find_package(OpenGL REQUIRED)
+endif()
+
 find_package(Freetype REQUIRED)
 find_package(JPEG REQUIRED)
 find_package(PNG REQUIRED)
-find_package(SDL2 REQUIRED)
 find_package(ZLIB REQUIRED)
 
-set(OpenGL_GL_PREFERENCE GLVND)
-find_package(OpenGL REQUIRED)
+
+# Determine platform and backend
+# ------------------------------
 
 if(LINUX)
 	option(SCREENSHOT_BUILD "Build screenshotter build (Linux only)" FALSE)
@@ -30,6 +47,8 @@ endif()
 
 if(WIN32)
 	set(TMS_BACKEND "windows")
+elseif(ANDROID)
+	set(TMS_BACKEND "android")
 elseif(SCREENSHOT_BUILD)
 	set(TMS_BACKEND "screenshot-linux")
 elseif(HAIKU)
@@ -38,6 +57,10 @@ else()
 	set(TMS_BACKEND "linux")
 endif()
 
+
+# Include dirs and main source files
+# ----------------------------------
+
 include_directories(
 	src/
 	src/lua/
@@ -45,9 +68,7 @@ include_directories(
 	src/src/
 	${FREETYPE_INCLUDE_DIRS}
 	${JPEG_INCLUDE_DIRS}
-	${OPENGL_INCLUDE_DIRS}
 	${PNG_INCLUDE_DIRS}
-	${SDL2_INCLUDE_DIRS}
 	${ZLIB_INCLUDE_DIRS})
 
 file(GLOB SRCS
@@ -72,27 +93,76 @@ file(GLOB SRCS
 	src/src/Box2D/Particle/*.cc
 )
 
+if(ANDROID)
+	# Vendored SDL2 for Android
+
+	include_directories(
+		src/SDL-mobile/include/)
+
+	file(GLOB SDL_SRCS
+		src/SDL-mobile/src/main/android/SDL_android_main.cc
+		src/SDL-mobile/src/*.c
+		src/SDL-mobile/src/atomic/*.c
+		src/SDL-mobile/src/audio/*.c
+		src/SDL-mobile/src/audio/android/*.c
+		src/SDL-mobile/src/core/android/*.cc
+		src/SDL-mobile/src/cpuinfo/*.c
+		src/SDL-mobile/src/events/*.c
+		src/SDL-mobile/src/file/*.c
+		src/SDL-mobile/src/haptic/*.c
+		src/SDL-mobile/src/haptic/dummy/*.c
+		src/SDL-mobile/src/joystick/*.c
+		src/SDL-mobile/src/joystick/android/*.c
+		src/SDL-mobile/src/loadso/dlopen/*.c
+		src/SDL-mobile/src/render/*.c
+		src/SDL-mobile/src/render/*/*.c
+		src/SDL-mobile/src/stdlib/*.c
+		src/SDL-mobile/src/thread/*.c
+		src/SDL-mobile/src/thread/pthread/*.c
+		src/SDL-mobile/src/timer/*.c
+		src/SDL-mobile/src/timer/unix/*.c
+		src/SDL-mobile/src/video/*.c
+		src/SDL-mobile/src/video/android/*.c)
+	set(SRCS ${SRCS} ${SDL_SRCS})
+else()
+
+	# For non-Android, system SDL2 and OpenGL include dirs
+	include_directories(
+		${SDL2_INCLUDE_DIRS}
+		${OPENGL_INCLUDE_DIRS})
+endif()
+
+# Optional dependencies not found on Android or in the screenshot build
 if(NOT SCREENSHOT_BUILD)
-	find_package(PkgConfig REQUIRED)
-	pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+	if(NOT ANDROID)
+		find_package(PkgConfig REQUIRED)
+		pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+
+		find_package(GLEW REQUIRED)
+
+		include_directories(
+			${GLEW_INCLUDE_DIRS}
+			${GTK3_INCLUDE_DIRS})
+	endif()
+
 	find_package(CURL REQUIRED)
-	find_package(GLEW REQUIRED)
+
+	file(GLOB SDL_mixer_SRCS src/SDL_mixer/*.c)
+	set(SRCS ${SRCS} ${SDL_mixer_SRCS})
 
 	include_directories(
 		${CURL_INCLUDE_DIR}
-		${GLEW_INCLUDE_DIRS}
-		${GTK3_INCLUDE_DIRS}
 		src/SDL_mixer/)
+endif()
 
-	file(GLOB SDL_mixer_SRCS src/SDL_mixer/*.c)
-	set(SRCS ${SRCS} ${SDL_mixer_SRCS})
+# Optional luasocket functionality
 
+if(NOT SCREENSHOT_BUILD AND NOT ANDROID)
 	option(USE_LUASOCKET "Build with Luasocket support" TRUE)
 else()
 	set(USE_LUASOCKET false)
 endif()
 
-# Luasocket
 if(USE_LUASOCKET)
 	set(LUASOCKET_FLAGS "-DBUILD_LUASOCKET -DLUASOCKET_INET_PTON")
 
@@ -119,9 +189,15 @@ if(USE_LUASOCKET)
 		${LUASOCKET_PLAT_SRC})
 endif()
 
-set(SRCS ${SRCS} src/tms/backends/${TMS_BACKEND}/main.cc)
+
+if(ANDROID)
+	set(SRCS ${SRCS} src/tms/backends/android/main.c)
+else()
+	set(SRCS ${SRCS} src/tms/backends/${TMS_BACKEND}/main.cc)
+endif()
 
 if(WIN32)
+	# Windows manifest (resource and icon) for Windows builds
 	set(WINRESOURCE_FILE "packaging/principia.rc")
 	set(WINMANIFEST_FILE "packaging/principia.manifest")
 
@@ -137,37 +213,70 @@ if(WIN32)
 	set(SRCS ${SRCS} ${CMAKE_CURRENT_BINARY_DIR}/principia.rc.o)
 endif()
 
-add_executable(${PROJECT_NAME} ${SRCS})
+
+# Add executable (or library for Android)
+# ---------------------------------------
+
+if(ANDROID)
+	add_library(${PROJECT_NAME} SHARED ${SRCS})
+else()
+	add_executable(${PROJECT_NAME} ${SRCS})
+endif()
+
+
+# Link libraries against executable
+# ---------------------------------
+
 target_link_libraries(
 	${PROJECT_NAME}
 		${FREETYPE_LIBRARIES}
 		${JPEG_LIBRARIES}
-		${OPENGL_LIBRARIES}
 		${PNG_LIBRARIES}
-		${SDL2_LIBRARIES}
 		${ZLIB_LIBRARIES})
 
 if(NOT SCREENSHOT_BUILD)
+	target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES})
+
+	if(NOT ANDROID)
+		target_link_libraries(
+			${PROJECT_NAME}
+				${GLEW_LIBRARIES}
+				${GTK3_LIBRARIES})
+	endif()
+endif()
+
+if(NOT ANDROID)
 	target_link_libraries(
 		${PROJECT_NAME}
-			${CURL_LIBRARIES}
-			${GLEW_LIBRARIES}
-			${GTK3_LIBRARIES})
+			${OPENGL_LIBRARIES}
+			${SDL2_LIBRARIES})
 endif()
 
-set(COMMON_FLAGS "${LUASOCKET_FLAGS} -DTMS_BACKEND_PC -DTMS_FAST_MATH -DLUA_COMPAT_MODULE")
 
-if(WIN32)
-	target_link_libraries(${PROJECT_NAME} ws2_32.lib version.lib shlwapi.lib winmm.lib)
+# Compiler flags
+# --------------
 
-	set(COMMON_FLAGS "${COMMON_FLAGS} -DTMS_BACKEND_WINDOWS -D_WIN32_WINNT=0x0501 -Dsrandom=srand -Drandom=rand -DUNICODE")
-elseif(SCREENSHOT_BUILD)
-	# Screenshot build doesn't use GLEW
-	set(COMMON_FLAGS "${COMMON_FLAGS} -DGL_GLEXT_PROTOTYPES -DNO_UI -DTMS_BACKEND_LINUX_SS")
-elseif(HAIKU)
-	set(COMMON_FLAGS "${COMMON_FLAGS} -DTMS_BACKEND_HAIKU")
+set(COMMON_FLAGS "${LUASOCKET_FLAGS} -DLUA_COMPAT_MODULE")
+
+if(ANDROID)
+	target_link_libraries(${PROJECT_NAME} -landroid -lz -ldl -lGLESv1_CM -lGLESv2 -llog)
+
+	set(COMMON_FLAGS "${COMMON_FLAGS} -DGL_GLEXT_PROTOTYPES -DHAVE_GCC_ATOMICS -DTMS_BACKEND_ANDROID -DTMS_BACKEND_MOBILE")
 else()
-	set(COMMON_FLAGS "${COMMON_FLAGS} -DTMS_BACKEND_LINUX")
+	set(COMMON_FLAGS "${COMMON_FLAGS} -DTMS_BACKEND_PC -DTMS_FAST_MATH")
+
+	if(WIN32)
+		target_link_libraries(${PROJECT_NAME} ws2_32.lib version.lib shlwapi.lib winmm.lib)
+
+		set(COMMON_FLAGS "${COMMON_FLAGS} -DTMS_BACKEND_WINDOWS -D_WIN32_WINNT=0x0501 -Dsrandom=srand -Drandom=rand -DUNICODE")
+	elseif(SCREENSHOT_BUILD)
+		# Screenshot build doesn't use GLEW
+		set(COMMON_FLAGS "${COMMON_FLAGS} -DGL_GLEXT_PROTOTYPES -DNO_UI -DTMS_BACKEND_LINUX_SS")
+	elseif(HAIKU)
+		set(COMMON_FLAGS "${COMMON_FLAGS} -DTMS_BACKEND_HAIKU")
+	else()
+		set(COMMON_FLAGS "${COMMON_FLAGS} -DTMS_BACKEND_LINUX")
+	endif()
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -176,7 +285,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 endif()
 
 set(COMMON_FLAGS_DEBUG "${COMMON_FLAGS} -O0 -ggdb -ffast-math -Werror=return-type -DDEBUG=1")
-set(COMMON_FLAGS_RELEASE "${COMMON_FLAGS} -DNDEBUG=1 -fomit-frame-pointer -fvisibility=hidden -fdata-sections -ffunction-sections")
+set(COMMON_FLAGS_RELEASE "${COMMON_FLAGS} -DNDEBUG=1 -fomit-frame-pointer -fdata-sections -ffunction-sections")
 
 set(CMAKE_C_FLAGS_RELEASE "${COMMON_FLAGS_RELEASE} -O1")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g")
@@ -194,7 +303,9 @@ if(WIN32)
 	set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-mwindows")
 endif()
 
+
 # Installation
+# ------------
 
 if(UNIX)
 	include(GNUInstallDirs)
diff --git a/build-android/.gitignore b/build-android/.gitignore
index 89e5edf53..8bd5c8c98 100644
--- a/build-android/.gitignore
+++ b/build-android/.gitignore
@@ -5,3 +5,4 @@ principia/build/
 *.apk
 *.apk.idsig
 local.properties
+.cxx/
diff --git a/build-android/build.gradle b/build-android/build.gradle
index fff51b596..c0d0115e5 100644
--- a/build-android/build.gradle
+++ b/build-android/build.gradle
@@ -10,8 +10,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
 }
 
 task clean(type: Delete) {
diff --git a/build-android/gradle/wrapper/gradle-wrapper.properties b/build-android/gradle/wrapper/gradle-wrapper.properties
index e02595280..c09e53be6 100644
--- a/build-android/gradle/wrapper/gradle-wrapper.properties
+++ b/build-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Aug 07 11:51:41 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/build-android/jni b/build-android/jni
deleted file mode 120000
index 5cd551cf2..000000000
--- a/build-android/jni
+++ /dev/null
@@ -1 +0,0 @@
-../src
\ No newline at end of file
diff --git a/build-android/principia/build.gradle b/build-android/principia/build.gradle
index 681c1bafd..c7650de2f 100644
--- a/build-android/principia/build.gradle
+++ b/build-android/principia/build.gradle
@@ -22,15 +22,16 @@ android {
 
         ndk {
             abiFilters "arm64-v8a", "armeabi-v7a", "x86_64"
-            // "x86", "x86-64"
+            //abiFilters "arm64-v8a" // debugging on phone
+            //abiFilters "x86_64"    // debugging on emulator
         }
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     externalNativeBuild {
-        ndkBuild {
-            path = file("../jni/Android.mk")
+        cmake {
+            path file("../../CMakeLists.txt")
         }
     }
 
diff --git a/build-android/principia/src/main/java/org/libsdl/app/SDLActivity.java b/build-android/principia/src/main/java/org/libsdl/app/SDLActivity.java
index e9be7e42b..3809d55ba 100644
--- a/build-android/principia/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/build-android/principia/src/main/java/org/libsdl/app/SDLActivity.java
@@ -145,11 +145,7 @@ public class SDLActivity extends Activity implements DialogInterface.OnDismissLi
 
     // Load the .so
     static {
-        //System.loadLibrary("SDL2");
-        //System.loadLibrary("SDL2_image");
-        //System.loadLibrary("SDL2_mixer");
-        //System.loadLibrary("SDL2_ttf");
-        System.loadLibrary("main");
+        System.loadLibrary("principia");
     }
 
     public SurfaceHolder mHolder;
diff --git a/cmake/Modules/PrincipiaAndroidLibs.cmake b/cmake/Modules/PrincipiaAndroidLibs.cmake
new file mode 100644
index 000000000..c70e0cfcd
--- /dev/null
+++ b/cmake/Modules/PrincipiaAndroidLibs.cmake
@@ -0,0 +1,11 @@
+set(DEPS "${CMAKE_SOURCE_DIR}/build-android/deps/${ANDROID_ABI}")
+
+set(CURL_INCLUDE_DIR ${DEPS}/curl/include)
+set(CURL_LIBRARY ${DEPS}/curl/libcurl.a;${DEPS}/curl/libmbedcrypto.a;${DEPS}/curl/libmbedtls.a;${DEPS}/curl/libmbedx509.a)
+set(FREETYPE_INCLUDE_DIR_ft2build ${DEPS}/freetype/include/freetype2)
+set(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR_ft2build}/freetype)
+set(FREETYPE_LIBRARY ${DEPS}/freetype/libfreetype.a)
+set(JPEG_INCLUDE_DIR ${DEPS}/libjpeg/include)
+set(JPEG_LIBRARY ${DEPS}/libjpeg/libjpeg.a)
+set(PNG_PNG_INCLUDE_DIR ${DEPS}/libpng/include) #what
+set(PNG_LIBRARY ${DEPS}/libpng/libpng.a)
diff --git a/src/Android.mk b/src/Android.mk
deleted file mode 100644
index 1f3a4c76e..000000000
--- a/src/Android.mk
+++ /dev/null
@@ -1,104 +0,0 @@
-
-ROOT := $(call my-dir)
-
-LOCAL_PATH = $(ROOT)
-DEPROOT := ../build-android/deps/$(TARGET_ARCH_ABI)
-include $(CLEAR_VARS)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libcurl
-LOCAL_SRC_FILES := $(DEPROOT)/curl/libcurl.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libmbedcrypto
-LOCAL_SRC_FILES := $(DEPROOT)/curl/libmbedcrypto.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libmbedtls
-LOCAL_SRC_FILES := $(DEPROOT)/curl/libmbedtls.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libmbedx509
-LOCAL_SRC_FILES := $(DEPROOT)/curl/libmbedx509.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := freetype
-LOCAL_SRC_FILES := $(DEPROOT)/freetype/libfreetype.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libjpeg
-LOCAL_SRC_FILES := $(DEPROOT)/libjpeg/libjpeg.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libpng
-LOCAL_SRC_FILES := $(DEPROOT)/libpng/libpng.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := main
-SDL_PATH := $(ROOT)/SDL-mobile/SDL
-TMS_PATH := $(ROOT)/tms
-
-#$(warning $(ROOT))
-
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_C_INCLUDES += \
-	$(SDL_PATH)/include \
-	$(TMS_PATH)/backends/android/ \
-	$(ROOT)/SDL-mobile/ \
-	$(ROOT)/SDL_ttf/ \
-	$(ROOT)/SDL_image/ \
-	$(ROOT)/SDL_mixer/ \
-	$(ROOT)/src/ $(ROOT)/lua/ \
-	../deps/$(TARGET_ARCH_ABI)/curl/include/ \
-	../deps/$(TARGET_ARCH_ABI)/freetype/include/freetype2/ \
-	../deps/$(TARGET_ARCH_ABI)/freetype/include/ \
-	../deps/$(TARGET_ARCH_ABI)/libjpeg/include/ \
-	../deps/$(TARGET_ARCH_ABI)/libpng/include/
-
-GLOBAL_FLAGS := -DGL_GLEXT_PROTOTYPES \
-				-DANDROID \
-				-D__ANDROID__ \
-				-DSDL_NO_COMPAT \
-				-DUNICODE \
-				-DTMS_BACKEND_ANDROID \
-				-DTMS_BACKEND_MOBILE \
-                -DHAVE_GCC_ATOMICS \
-				-Os -ffast-math
-
-LOCAL_CONLYFLAGS := -std=gnu99
-LOCAL_CFLAGS += $(GLOBAL_FLAGS) -D__STDC_FORMAT_MACROS=1
-LOCAL_CPPFLAGS += $(GLOBAL_FLAGS)
-LOCAL_STATIC_LIBRARIES := \
-	freetype libjpeg libpng \
-	libcurl libmbedtls libmbedx509 libmbedcrypto
-LOCAL_LDLIBS := -lz -ldl -lGLESv1_CM -lGLESv2 -llog
-
-# for SDL_image (we only use png and jpeg)
-LOCAL_CFLAGS += -DLOAD_JPG -DLOAD_PNG -DLOAD_TGA
-
-include $(ROOT)/lua/Android.mk
-include $(ROOT)/SDL_image/Android.mk
-include $(ROOT)/SDL_mixer/Android.mk
-include $(TMS_PATH)/Android.mk
-include $(SDL_PATH)/Android.mk
-include $(ROOT)/src/Android.mk
-#include $(call all-subdir-makefiles)
-
-# reset path before building
-
-#$(warning $(LOCAL_SRC_FILES))
-
-LOCAL_PATH := $(ROOT)
-
-#$(warning $(LOCAL_PATH))
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/src/Application.mk b/src/Application.mk
deleted file mode 100644
index 01403aca2..000000000
--- a/src/Application.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-APP_OPTIM := release
-
-APP_STL := c++_static
-LOCAL_ARM_MODE := arm
diff --git a/src/SDL_image/Android.mk b/src/SDL_image/Android.mk
deleted file mode 100644
index 1ad3e31d3..000000000
--- a/src/SDL_image/Android.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-LOCAL_SRC_FILES += \
-	SDL_image/IMG_jpg.c \
-	SDL_image/IMG_png.c \
-	SDL_image/IMG.c
diff --git a/src/SDL_mixer/Android.mk b/src/SDL_mixer/Android.mk
deleted file mode 100644
index 011fccff6..000000000
--- a/src/SDL_mixer/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/SDL_mixer/*.c))
diff --git a/src/lua/Android.mk b/src/lua/Android.mk
deleted file mode 100644
index e96e65708..000000000
--- a/src/lua/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-LOCAL_SRC_FILES += \
-  lua/eris.c \
-  lua/lapi.c \
-  lua/lauxlib.c \
-  lua/lbaselib.c \
-  lua/lbitlib.c \
-  lua/lcode.c \
-  lua/lcorolib.c \
-  lua/lctype.c \
-  lua/ldblib.c \
-  lua/ldebug.c \
-  lua/ldo.c \
-  lua/ldump.c \
-  lua/lfunc.c \
-  lua/lgc.c \
-  lua/linit.c \
-  lua/llex.c \
-  lua/lmathlib.c \
-  lua/lmem.c \
-  lua/lobject.c \
-  lua/lopcodes.c \
-  lua/lparser.c \
-  lua/lstate.c \
-  lua/lstring.c \
-  lua/lstrlib.c \
-  lua/ltable.c \
-  lua/ltablib.c \
-  lua/ltm.c \
-  lua/lundump.c \
-  lua/lvm.c \
-  lua/lzio.c
diff --git a/src/src/Android.mk b/src/src/Android.mk
deleted file mode 100644
index 41575c065..000000000
--- a/src/src/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-DIR := src
-
-LOCAL_SRC_FILES += \
-	$(subst $(LOCAL_PATH)/,, \
-	$(wildcard $(LOCAL_PATH)/$(DIR)/*.cc) \
-	$(wildcard $(LOCAL_PATH)/$(DIR)/*.c) \
-	$(wildcard $(LOCAL_PATH)/$(DIR)/Box2D/Dynamics/*.cc) \
-	$(wildcard $(LOCAL_PATH)/$(DIR)/Box2D/Collision/*.cc) \
-	$(wildcard $(LOCAL_PATH)/$(DIR)/Box2D/Collision/Shapes/*.cc) \
-	$(wildcard $(LOCAL_PATH)/$(DIR)/Box2D/Common/*.cc) \
-	$(wildcard $(LOCAL_PATH)/$(DIR)/Box2D/Dynamics/Contacts/*.cc) \
-	$(wildcard $(LOCAL_PATH)/$(DIR)/Box2D/Dynamics/Joints/*.cc) \
-	$(wildcard $(LOCAL_PATH)/$(DIR)/Box2D/Particle/*.cc))
diff --git a/src/tms/Android.mk b/src/tms/Android.mk
deleted file mode 100644
index 5c49a6200..000000000
--- a/src/tms/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_SRC_FILES += \
-	$(subst $(LOCAL_PATH)/,, \
-	$(wildcard $(LOCAL_PATH)/tms/core/*.c) \
-	$(wildcard $(LOCAL_PATH)/tms/math/*.c) \
-	$(wildcard $(LOCAL_PATH)/tms/util/*.c) )\
-	tms/backends/android/main.c \
-	tms/bindings/cpp/cpp.cc\
-	tms/modules/3ds.c