From 79010e972ebe6e381d6b5402e5399ad4117dd374 Mon Sep 17 00:00:00 2001
From: savilli <78875209+savilli@users.noreply.github.com>
Date: Thu, 25 Aug 2022 23:48:49 +0200
Subject: [PATCH] Fix and enable x86 build for Android (#12700)

---
 .github/workflows/android.yml | 10 ++++++++++
 android/app/build.gradle      |  2 +-
 android/native/build.gradle   |  2 +-
 android/native/jni/Android.mk | 14 ++++++++++++--
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 20411a332..8cbe5e09f 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -40,3 +40,13 @@ jobs:
       with:
         name: Minetest-arm64-v8a.apk
         path: android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk
+    - name: Save x86 artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: Minetest-x86.apk
+        path: android/app/build/outputs/apk/release/app-x86-release-unsigned.apk
+    - name: Save x86_64 artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: Minetest-x86_64.apk
+        path: android/app/build/outputs/apk/release/app-x86_64-release-unsigned.apk
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e8ba95722..ce895edd1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -40,7 +40,7 @@ android {
 		abi {
 			enable true
 			reset()
-			include 'armeabi-v7a', 'arm64-v8a'
+			include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
 		}
 	}
 
diff --git a/android/native/build.gradle b/android/native/build.gradle
index 2254aab3a..90e4fe2e7 100644
--- a/android/native/build.gradle
+++ b/android/native/build.gradle
@@ -31,7 +31,7 @@ android {
 		abi {
 			enable true
 			reset()
-			include 'armeabi-v7a', 'arm64-v8a'//, 'x86'
+			include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
 		}
 	}
 
diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index 50651d5ba..cd9326d4a 100644
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -43,6 +43,16 @@ LOCAL_MODULE := Irrlicht
 LOCAL_SRC_FILES := deps/$(APP_ABI)/Irrlicht/libIrrlichtMt.a
 include $(PREBUILT_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := Irrlicht-libpng
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Irrlicht/libpng.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Irrlicht-libjpeg
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Irrlicht/libjpeg.a
+include $(PREBUILT_STATIC_LIBRARY)
+
 ifndef USE_BUILTIN_LUA
 
 include $(CLEAR_VARS)
@@ -270,7 +280,7 @@ LOCAL_STATIC_LIBRARIES += \
 	Curl libmbedcrypto libmbedtls libmbedx509 \
 	Freetype \
 	Iconv libcharset \
-	Irrlicht \
+	Irrlicht Irrlicht-libpng Irrlicht-libjpeg \
 	OpenAL \
 	Gettext \
 	SQLite3 \
@@ -281,7 +291,7 @@ ifndef USE_BUILTIN_LUA
 endif
 LOCAL_STATIC_LIBRARIES += android_native_app_glue $(PROFILER_LIBS)
 
-LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES
+LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES -lz
 
 include $(BUILD_SHARED_LIBRARY)