TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-15 15:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stub libfontconfig.so

Browse Source
This commit is contained in:
khanhduytran0 2020-10-08 13:58:09 +07:00
parent 8de4f7be05
commit 4bf66902aa
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@ -354,19 +354,24 @@ public class PojavLoginActivity extends AppCompatActivity
setPref(PREF_IS_INSTALLED_JAVARUNTIME, true); setPref(PREF_IS_INSTALLED_JAVARUNTIME, true);
} }
// Refresh libawt_xawt.so // Refresh libraries
File fileLibawtXawt = new File(Tools.homeJreDir, "lib/libawt_xawt.so"); copyDummyNativeLib("libawt_xawt.so");
fileLibawtXawt.delete(); copyDummyNativeLib("libfontconfig.so");
IOUtils.copy(
new FileInputStream(new File(getApplicationInfo().nativeLibraryDir, "libawt_xawt.so")),
new FileOutputStream(fileLibawtXawt)
);
} }
catch(Exception e){ catch(Throwable e){
Tools.showError(this, e); Tools.showError(this, e);
} }
} }
private void copyDummyNativeLib(String name) throws Throwable {
File fileLib = new File(Tools.homeJreDir, "lib/" + name);
fileLib.delete();
IOUtils.copy(
new FileInputStream(new File(getApplicationInfo().nativeLibraryDir, name)),
new FileOutputStream(fileLib)
);
}
private File selectJreTarFile() throws InterruptedException { private File selectJreTarFile() throws InterruptedException {
final StringBuilder selectedFile = new StringBuilder(); final StringBuilder selectedFile = new StringBuilder();

11
app/src/main/jni/Android.mk
View File

@ -1,4 +1,5 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
HERE_PATH := $(LOCAL_PATH)
include $(CLEAR_VARS) include $(CLEAR_VARS)
# Link GLESv2 for test # Link GLESv2 for test
@ -19,7 +20,7 @@ include $(BUILD_SHARED_LIBRARY)
# include $(BUILD_SHARED_LIBRARY) # include $(BUILD_SHARED_LIBRARY)
# libawt_xawt without X11 # libawt_xawt without X11
LOCAL_PATH := $(LOCAL_PATH)/awt_xawt LOCAL_PATH := $(HERE_PATH)/awt_xawt
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := awt_xawt LOCAL_MODULE := awt_xawt
# LOCAL_CFLAGS += -DHEADLESS # LOCAL_CFLAGS += -DHEADLESS
@ -37,3 +38,11 @@ LOCAL_SRC_FILES := \
awt_Taskbar.c awt_Taskbar.c
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
# libfontconfig dummy implementation, althought have Android port...
LOCAL_PATH := $(HERE_PATH)/fontconfig
include $(CLEAR_VARS)
LOCAL_MODULE := fontconfig
LOCAL_SRC_FILES := \
fontconfig.c
include $(BUILD_SHARED_LIBRARY)

2
app/src/main/jni/fontconfig/fontconfig.c Normal file
View File

@ -0,0 +1,2 @@
// dummy implementation of Unix fontconfig