Skip to content

[tools] Fix format of android PLATFORM define #2008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshtynjala merged 1 commit into from
Dec 17, 2025
Merged

[tools] Fix format of android PLATFORM define #2008

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/platforms/AndroidPlatform.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ class AndroidPlatform extends PlatformTarget
{
var minSDKVer = project.config.getInt("android.minimum-sdk-version", 21);
//PLATFORM define needed for older ndk and gcc toolchain
var haxeParams = [hxml, "-D", "android", "-D", 'PLATFORM_NUMBER=$minSDKVer', "-D", 'PLATFORM=$minSDKVer'];
var cppParams = ["-Dandroid", '-DPLATFORM_NUMBER=$minSDKVer', '-DPLATFORM=$minSDKVer'];
var haxeParams = [hxml, "-D", "android", "-D", 'PLATFORM_NUMBER=$minSDKVer', "-D", 'PLATFORM=android-$minSDKVer'];
var cppParams = ["-Dandroid", '-DPLATFORM_NUMBER=$minSDKVer', '-DPLATFORM=android-$minSDKVer'];
var path = sourceSet + "/jniLibs/armeabi";
var suffix = ".so";

Expand Down Expand Up @@ -377,7 +377,7 @@ class AndroidPlatform extends PlatformTarget
var minSDKVer = 21;
var platformNumberDefine = '-DPLATFORM_NUMBER=$minSDKVer';
// Required for older ndk and gcc toolchain
var platformDefine = '-DPLATFORM=$minSDKVer';
var platformDefine = '-DPLATFORM=android-$minSDKVer';

if (armv5) commands.push(["-Dandroid", platformDefine]);
if (armv7) commands.push(["-Dandroid", "-DHXCPP_ARMV7", platformDefine, platformNumberDefine]);
Expand Down