diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index 6d3f0e9fa..492de9173 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -354,19 +354,24 @@ public class PojavLoginActivity extends AppCompatActivity setPref(PREF_IS_INSTALLED_JAVARUNTIME, true); } - // Refresh libawt_xawt.so - File fileLibawtXawt = new File(Tools.homeJreDir, "lib/libawt_xawt.so"); - fileLibawtXawt.delete(); - IOUtils.copy( - new FileInputStream(new File(getApplicationInfo().nativeLibraryDir, "libawt_xawt.so")), - new FileOutputStream(fileLibawtXawt) - ); + // Refresh libraries + copyDummyNativeLib("libawt_xawt.so"); + copyDummyNativeLib("libfontconfig.so"); } - catch(Exception e){ + catch(Throwable 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 { final StringBuilder selectedFile = new StringBuilder(); diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk index 79c530dc0..5f5925846 100644 --- a/app/src/main/jni/Android.mk +++ b/app/src/main/jni/Android.mk @@ -1,4 +1,5 @@ LOCAL_PATH := $(call my-dir) +HERE_PATH := $(LOCAL_PATH) include $(CLEAR_VARS) # Link GLESv2 for test @@ -19,7 +20,7 @@ include $(BUILD_SHARED_LIBRARY) # include $(BUILD_SHARED_LIBRARY) # libawt_xawt without X11 -LOCAL_PATH := $(LOCAL_PATH)/awt_xawt +LOCAL_PATH := $(HERE_PATH)/awt_xawt include $(CLEAR_VARS) LOCAL_MODULE := awt_xawt # LOCAL_CFLAGS += -DHEADLESS @@ -37,3 +38,11 @@ LOCAL_SRC_FILES := \ awt_Taskbar.c 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) + diff --git a/app/src/main/jni/fontconfig/fontconfig.c b/app/src/main/jni/fontconfig/fontconfig.c new file mode 100644 index 000000000..37508a8fb --- /dev/null +++ b/app/src/main/jni/fontconfig/fontconfig.c @@ -0,0 +1,2 @@ +// dummy implementation of Unix fontconfig +