Renamed crypto and ssl libraries + Bump JNI versions

Author: vkryl

app/build.gradle.kts

@@ -158,8 +158,8 @@ android {
     Config.SUPPORTED_ABI.forEach { abi ->
       jniLibs.pickFirsts.let { set ->
         set.add("lib/$abi/libc++_shared.so")
-        set.add("tdlib/openssl/$abi/lib/libcrypto.so")
-        set.add("tdlib/openssl/$abi/lib/libssl.so")
+        set.add("tdlib/openssl/$abi/lib/libcryptox.so")
+        set.add("tdlib/openssl/$abi/lib/libsslx.so")
         set.add("tdlib/src/main/libs/$abi/libtdjni.so")
       }
     }

app/jni/CMakeLists.txt

@@ -105,11 +105,11 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ADD_LINKER_FLAGS}"
 
 add_library(crypto SHARED IMPORTED)
 set_target_properties(crypto PROPERTIES IMPORTED_LOCATION
-  ${TDLIB_DIR}/openssl/${ANDROID_ABI}/lib/libcrypto.so
+  ${TDLIB_DIR}/openssl/${ANDROID_ABI}/lib/libcryptox.so
 )
 add_library(ssl SHARED IMPORTED)
 set_target_properties(ssl PROPERTIES IMPORTED_LOCATION
-  ${TDLIB_DIR}/openssl/${ANDROID_ABI}/lib/libssl.so
+  ${TDLIB_DIR}/openssl/${ANDROID_ABI}/lib/libsslx.so
 )
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.11.0")
   target_include_directories(crypto INTERFACE
@@ -124,6 +124,7 @@ add_library(tdjni SHARED IMPORTED)
 set_target_properties(tdjni PROPERTIES IMPORTED_LOCATION
   ${TDLIB_DIR}/src/main/libs/${ANDROID_ABI}/libtdjni.so
 )
+target_link_libraries(tdjni INTERFACE ssl crypto)
 
 # flac
 include("${CMAKE_HOME_DIRECTORY}/BuildFlac.cmake")

app/src/main/java/org/thunderdog/challegram/unsorted/NLoader.java

@@ -68,11 +68,11 @@ public static synchronized boolean loadLibrary () {
       try {
         ReLinkerInstance reLinker = ReLinker.recursively().log(NLoader.instance());
         loadLibraryImpl(reLinker, "c++_shared", BuildConfig.NDK_VERSION);
-        loadLibraryImpl(reLinker, "crypto", BuildConfig.OPENSSL_VERSION);
-        loadLibraryImpl(reLinker, "ssl", BuildConfig.OPENSSL_VERSION);
+        loadLibraryImpl(reLinker, "cryptox", BuildConfig.OPENSSL_VERSION);
+        loadLibraryImpl(reLinker, "sslx", BuildConfig.OPENSSL_VERSION);
         loadLibraryImpl(reLinker, "tdjni", BuildConfig.TDLIB_VERSION);
         loadLibraryImpl(reLinker, "leveldbjni", BuildConfig.LEVELDB_VERSION);
-        loadLibraryImpl(reLinker, "tgcallsjni", "1.0.0" /*FIXME*/);
+        loadLibraryImpl(reLinker, "tgcallsjni", BuildConfig.JNI_VERSION /*TODO: separate variable?*/);
         loadLibraryImpl(reLinker, "tgxjni", BuildConfig.JNI_VERSION);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
           OpusLibrary.setLibraries(C.CRYPTO_TYPE_UNSUPPORTED);

buildSrc/src/main/kotlin/me/vkryl/plugin/ModulePlugin.kt

@@ -172,6 +172,7 @@ open class ModulePlugin : Plugin<Project> {
             }
 
             var openSslVersion: String = ""
+            var openSslVersionFull: String = ""
             val openSslVersionFile = File(project.rootDir.absoluteFile, "tdlib/source/openssl/include/openssl/opensslv.h")
             openSslVersionFile.bufferedReader().use { reader ->
               val regex = Regex("^#\\s*define OPENSSL_VERSION_NUMBER\\s*((?:0x)[0-9a-fAF]+)L?\$")
@@ -194,7 +195,8 @@ open class ModulePlugin : Plugin<Project> {
                   if (status != 0xf) {
                     error("Using non-stable OpenSSL version: $rawVersion (status = ${status.toString(16)})")
                   }
-                  openSslVersion = "${major}.${minor}.${fix}${('a'.code - 1 + patch).toChar()}"
+                  openSslVersion = "${major}.${minor}"
+                  openSslVersionFull = "${major}.${minor}.${fix}${('a'.code - 1 + patch).toChar()}"
                   break
                 }
               }
@@ -278,6 +280,7 @@ open class ModulePlugin : Plugin<Project> {
               buildConfigString("DOWNLOAD_URL", appDownloadUrl)
 
               buildConfigString("OPENSSL_VERSION", openSslVersion)
+              buildConfigString("OPENSSL_VERSION_FULL", openSslVersionFull)
               buildConfigString("TDLIB_VERSION", tdlibVersion)
 
               buildConfigString("REMOTE_URL", remoteUrl)

tdlib

@@ -4,7 +4,7 @@ version.major=0
 # Anchor date point in app versioning
 version.creation=873642600564
 # Native bundle (/app/jni)
-version.jni=224.0.0
+version.jni=224.0.1
 # LevelDB (/vkryl/leveldb)
 version.leveldb=5.0.0
 # Emoji (/app/src/main/assets/emoji)