kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use armeabi-v7a for ARMv7 on Android (old devices that broke on this probably are no longer supported due to newer NDK minimum)

Browse Source
This commit is contained in:
Joshua Granick
2018-07-30 12:19:02 -07:00
parent 5962846dc2
commit 8553739479
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/platforms/AndroidPlatform.hx
View File

@@ -89,13 +89,7 @@ class AndroidPlatform extends PlatformTarget {
haxeParams.push ("-D"); haxeParams.push ("-D");
haxeParams.push ("HXCPP_ARMV7"); haxeParams.push ("HXCPP_ARMV7");
cppParams.push ("-DHXCPP_ARMV7"); cppParams.push ("-DHXCPP_ARMV7");
path = sourceSet + "/jniLibs/armeabi-v7a";
if (hasARMV5) {
path = sourceSet + "/jniLibs/armeabi-v7a";
}
suffix = "-v7.so"; suffix = "-v7.so";
} else if (architecture == Architecture.ARM64) { } 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")) { if (FileSystem.exists (sourceSet + "/jniLibs/armeabi-v7a")) {