trigger arm-v7a-neon check when armeabi-v7a is loaded, fix #126

This commit is contained in:
Taner Sener
2019-04-26 08:32:03 +03:00
parent ef004c8d03
commit 2a8317e3fe
2 changed files with 8 additions and 3 deletions
@@ -37,6 +37,10 @@ public class AbiDetect {
FFmpeg.class.getName();
}
static final String ARM_V7A = "arm-v7a";
static final String ARM_V7A_NEON = "arm-v7a-neon";
private static boolean armV7aNeonLoaded;
/**
@@ -56,7 +60,7 @@ public class AbiDetect {
*/
public static String getAbi() {
if (armV7aNeonLoaded) {
return "arm-v7a-neon";
return ARM_V7A_NEON;
} else {
return getNativeAbi();
}
@@ -67,7 +71,7 @@ public class AbiDetect {
*
* @return loaded ABI name
*/
private native static String getNativeAbi();
public native static String getNativeAbi();
/**
* <p>Returns ABI name of the running cpu.
@@ -27,6 +27,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
import static com.arthenica.mobileffmpeg.FFmpeg.getBuildDate;
@@ -91,7 +92,7 @@ public class Config {
* NEON supported arm-v7a library has a different name
*/
boolean nativeLibraryLoaded = false;
if (cpuAbi == Abi.ABI_ARMV7A_NEON) {
if (Objects.equals(AbiDetect.getNativeAbi(), AbiDetect.ARM_V7A)) {
if (AbiDetect.isNativeLTSBuild()) {
/*