Fix library name of manual library loader

This commit is contained in:
Marvin W 2020-11-27 11:22:03 +01:00
parent a43273b5e0
commit 0b6f929eaa
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A

View File

@ -131,7 +131,7 @@ public class ProviderInstallerImpl {
// TODO: Move manual loading into helper function (as it is also used in both maps implementations) // TODO: Move manual loading into helper function (as it is also used in both maps implementations)
String primaryCpuAbi = (String) ApplicationInfo.class.getField("primaryCpuAbi").get(otherAppInfo); String primaryCpuAbi = (String) ApplicationInfo.class.getField("primaryCpuAbi").get(otherAppInfo);
if (primaryCpuAbi != null) { if (primaryCpuAbi != null) {
String path = "lib/" + primaryCpuAbi + "/libconscrypt_jni.so"; String path = "lib/" + primaryCpuAbi + "/libconscrypt_gmscore_jni.so";
File cacheFile = new File(context.createPackageContext(packageName, 0).getCacheDir().getAbsolutePath() + "/.gmscore/" + path); File cacheFile = new File(context.createPackageContext(packageName, 0).getCacheDir().getAbsolutePath() + "/.gmscore/" + path);
cacheFile.getParentFile().mkdirs(); cacheFile.getParentFile().mkdirs();
File apkFile = new File(context.getPackageCodePath()); File apkFile = new File(context.getPackageCodePath());
@ -144,7 +144,7 @@ public class ProviderInstallerImpl {
Log.d(TAG, "Can't load native library: " + path + " does not exist in " + apkFile); Log.d(TAG, "Can't load native library: " + path + " does not exist in " + apkFile);
} }
} }
Log.d(TAG, "Loading conscrypt_jni from " + cacheFile.getPath()); Log.d(TAG, "Loading conscrypt_gmscore_jni from " + cacheFile.getPath());
System.load(cacheFile.getAbsolutePath()); System.load(cacheFile.getAbsolutePath());
Class<NativeCrypto> clazz = NativeCrypto.class; Class<NativeCrypto> clazz = NativeCrypto.class;