Bug 1179074 - Use all of SUPPORTED_ABIS when loading libraries from APK. r=mfinkle

This commit is contained in:
Richard Newman 2015-07-02 06:05:25 -07:00
Родитель d2dd9ff605
Коммит 9e0d4fd66c
1 изменённых файлов: 14 добавлений и 1 удалений

Просмотреть файл

@ -281,8 +281,21 @@ public final class GeckoLoader {
} }
} }
final String abi = getCPUABI(); if (AppConstants.Versions.feature21Plus) {
String[] abis = Build.SUPPORTED_ABIS;
for (String abi : abis) {
if (tryLoadWithABI(lib, outDir, apkPath, abi)) {
return true;
}
}
return false;
} else {
final String abi = getCPUABI();
return tryLoadWithABI(lib, outDir, apkPath, abi);
}
}
private static boolean tryLoadWithABI(String lib, String outDir, String apkPath, String abi) {
try { try {
final ZipFile zipFile = new ZipFile(new File(apkPath)); final ZipFile zipFile = new ZipFile(new File(apkPath));
try { try {