diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index 6c05dd1f1..9884c043c 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -89,13 +89,7 @@ class AndroidPlatform extends PlatformTarget { haxeParams.push ("-D"); haxeParams.push ("HXCPP_ARMV7"); cppParams.push ("-DHXCPP_ARMV7"); - - if (hasARMV5) { - - path = sourceSet + "/jniLibs/armeabi-v7a"; - - } - + path = sourceSet + "/jniLibs/armeabi-v7a"; suffix = "-v7.so"; } else if (architecture == Architecture.ARM64) { @@ -135,7 +129,17 @@ class AndroidPlatform extends PlatformTarget { } - if (!ArrayHelper.containsValue (project.architectures, Architecture.ARMV7) || !hasARMV5) { + if (!hasARMV5) { + + if (FileSystem.exists (sourceSet + "/jniLibs/armeabi")) { + + PathHelper.removeDirectory (sourceSet + "/jniLibs/armeabi-"); + + } + + } + + if (!hasARMV7) { if (FileSystem.exists (sourceSet + "/jniLibs/armeabi-v7a")) {