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

Progress on newer NDK support (forces minimum API from 14 to 16)

Browse Source
This commit is contained in:
Joshua Granick
2019-04-05 18:07:13 -07:00
parent 2cb09c55df
commit 6dce7ad79a
9 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/platforms/AndroidPlatform.hx
View File

@@ -69,8 +69,8 @@ class AndroidPlatform extends PlatformTarget
for (architecture in architectures)
{
var haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-14"];
var cppParams = ["-Dandroid", "-DPLATFORM=android-14"];
var haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-16"];
var cppParams = ["-Dandroid", "-DPLATFORM=android-16"];
var path = sourceSet + "/jniLibs/armeabi";
var suffix = ".so";
@@ -249,10 +249,10 @@ class AndroidPlatform extends PlatformTarget
var commands = [];
if (armv5) commands.push(["-Dandroid", "-DPLATFORM=android-14"]);
if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", "-DHXCPP_ARM7", "-DPLATFORM=android-14"]);
if (armv5) commands.push(["-Dandroid", "-DPLATFORM=android-16"]);
if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", "-DHXCPP_ARM7", "-DPLATFORM=android-16"]);
if (arm64) commands.push(["-Dandroid", "-DHXCPP_ARM64", "-DPLATFORM=android-21"]);
if (x86) commands.push(["-Dandroid", "-DHXCPP_X86", "-DPLATFORM=android-14"]);
if (x86) commands.push(["-Dandroid", "-DHXCPP_X86", "-DPLATFORM=android-16"]);
CPPHelper.rebuild(project, commands);
}
@@ -339,7 +339,7 @@ class AndroidPlatform extends PlatformTarget
context.CPP_DIR = targetDirectory + "/obj";
context.OUTPUT_DIR = targetDirectory;
context.ANDROID_INSTALL_LOCATION = project.config.getString("android.install-location", "auto");
context.ANDROID_MINIMUM_SDK_VERSION = project.config.getInt("android.minimum-sdk-version", 14);
context.ANDROID_MINIMUM_SDK_VERSION = project.config.getInt("android.minimum-sdk-version", 16);
context.ANDROID_TARGET_SDK_VERSION = project.config.getInt("android.target-sdk-version", 26);
context.ANDROID_EXTENSIONS = project.config.getArrayString("android.extension");
context.ANDROID_PERMISSIONS = project.config.getArrayString("android.permission", [