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

Merge pull request #1519 from Apprentice-Alchemist/feature/android-api-21

Browse Source 
Upgrade to android API level 21.
This commit is contained in:
player-03
2022-03-09 01:48:32 -05:00
committed by GitHub
parent 3ba4c4c5c0 b15dcb94c1
commit 8397294017
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/Build.xml
View File

@@ -1,8 +1,6 @@
<xml> <xml>
<set name="PLATFORM" value="android-16" if="android" unless="HXCPP_ARM64 || HXCPP_X86_64" /> <set name="PLATFORM" value="android-21" if="android" />
<set name="PLATFORM" value="android-21" if="android HXCPP_ARM64" />
<set name="PLATFORM" value="android-21" if="android HXCPP_X86_64" />
<set name="HXCPP_CPP11" value="1" /> <set name="HXCPP_CPP11" value="1" />
<include name="${HXCPP}/build-tool/BuildCommon.xml" /> <include name="${HXCPP}/build-tool/BuildCommon.xml" />

16
tools/platforms/AndroidPlatform.hx
View File

@@ -71,8 +71,8 @@ class AndroidPlatform extends PlatformTarget
for (architecture in architectures) for (architecture in architectures)
{ {
var haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-16"]; var haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-21"];
var cppParams = ["-Dandroid", "-DPLATFORM=android-16"]; var cppParams = ["-Dandroid", "-DPLATFORM=android-21"];
var path = sourceSet + "/jniLibs/armeabi"; var path = sourceSet + "/jniLibs/armeabi";
var suffix = ".so"; var suffix = ".so";
@@ -86,9 +86,6 @@ class AndroidPlatform extends PlatformTarget
} }
else if (architecture == Architecture.ARM64) else if (architecture == Architecture.ARM64)
{ {
haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-21"];
cppParams = ["-Dandroid", "-DPLATFORM=android-21"];
haxeParams.push("-D"); haxeParams.push("-D");
haxeParams.push("HXCPP_ARM64"); haxeParams.push("HXCPP_ARM64");
cppParams.push("-DHXCPP_ARM64"); cppParams.push("-DHXCPP_ARM64");
@@ -105,9 +102,6 @@ class AndroidPlatform extends PlatformTarget
} }
else if (architecture == Architecture.X64) else if (architecture == Architecture.X64)
{ {
haxeParams = [hxml, "-D", "android", "-D", "PLATFORM=android-21"];
cppParams = ["-Dandroid", "-DPLATFORM=android-21"];
haxeParams.push("-D"); haxeParams.push("-D");
haxeParams.push("HXCPP_X86_64"); haxeParams.push("HXCPP_X86_64");
cppParams.push("-DHXCPP_X86_64"); cppParams.push("-DHXCPP_X86_64");
@@ -284,10 +278,10 @@ class AndroidPlatform extends PlatformTarget
var commands = []; var commands = [];
if (armv5) commands.push(["-Dandroid", "-DPLATFORM=android-16"]); if (armv5) commands.push(["-Dandroid", "-DPLATFORM=android-21"]);
if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", "-DHXCPP_ARM7", "-DPLATFORM=android-16"]); if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", "-DHXCPP_ARM7", "-DPLATFORM=android-21"]);
if (arm64) commands.push(["-Dandroid", "-DHXCPP_ARM64", "-DPLATFORM=android-21"]); if (arm64) commands.push(["-Dandroid", "-DHXCPP_ARM64", "-DPLATFORM=android-21"]);
if (x86) commands.push(["-Dandroid", "-DHXCPP_X86", "-DPLATFORM=android-16"]); if (x86) commands.push(["-Dandroid", "-DHXCPP_X86", "-DPLATFORM=android-21"]);
if (x64) commands.push(["-Dandroid", "-DHXCPP_X86_64", "-DPLATFORM=android-21"]); if (x64) commands.push(["-Dandroid", "-DHXCPP_X86_64", "-DPLATFORM=android-21"]);
CPPHelper.rebuild(project, commands); CPPHelper.rebuild(project, commands);