From d7795c892bedc9223daad373611161c8265ed5af Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 9 Apr 2020 08:51:34 +0200 Subject: [PATCH] Allow old openssl name in android client. --- client/Android/BuildFlags.java.in | 6 ++++++ .../com/freerdp/freerdpcore/services/LibFreeRDP.java | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 client/Android/BuildFlags.java.in diff --git a/client/Android/BuildFlags.java.in b/client/Android/BuildFlags.java.in new file mode 100644 index 000000000..9b15e47ba --- /dev/null +++ b/client/Android/BuildFlags.java.in @@ -0,0 +1,6 @@ +package com.freerdp.freerdpcore.utils; + +public class BuildFlags +{ + private final static boolean USE_OPENSSL_DEFAULT_NAMES = @USE_OPENSSL_DEFAULT_NAMES@; +} diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java index 8f5db2d9e..bab6345d3 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java @@ -35,8 +35,15 @@ public class LibFreeRDP static { final String h264 = "openh264"; - final String[] libraries = { h264, "ssl", "crypto", "jpeg", - "winpr2", "freerdp2", "freerdp-client2", "freerdp-android2" }; + final String[] libraries = { h264, + "freerdp-openssl", + "ssl", + "crypto", + "jpeg", + "winpr2", + "freerdp2", + "freerdp-client2", + "freerdp-android2" }; final String LD_PATH = System.getProperty("java.library.path"); for (String lib : libraries)