mirror of
https://github.com/sudoxnym/fdroiddata.git
synced 2026-05-20 12:49:14 +00:00
77 lines
2.2 KiB
Diff
77 lines
2.2 KiB
Diff
From d7a9bd2b8b2ccd4d992394ddcb03926050af7a0d Mon Sep 17 00:00:00 2001
|
|
From: savilli <78875209+savilli@users.noreply.github.com>
|
|
Date: Sun, 14 Aug 2022 14:26:26 +0200
|
|
Subject: [PATCH] Fix and enable x86 build for Android
|
|
|
|
---
|
|
android/app/build.gradle | 2 +-
|
|
android/native/build.gradle | 2 +-
|
|
android/native/jni/Android.mk | 15 +++++++++++++--
|
|
3 files changed, 15 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/android/app/build.gradle b/android/app/build.gradle
|
|
index e8ba9572204f..338167a94ce0 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'
|
|
}
|
|
}
|
|
|
|
diff --git a/android/native/build.gradle b/android/native/build.gradle
|
|
index 2254aab3aba9..ef8ac2653bf8 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'
|
|
}
|
|
}
|
|
|
|
diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
|
|
index 50651d5ba4ad..3edbd29ca482 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,8 @@ ifndef USE_BUILTIN_LUA
|
|
endif
|
|
LOCAL_STATIC_LIBRARIES += android_native_app_glue $(PROFILER_LIBS)
|
|
|
|
-LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES
|
|
+# Irrlicht uses zlib
|
|
+LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES -lz
|
|
|
|
include $(BUILD_SHARED_LIBRARY)
|
|
|