GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bug/issue-2476' of https://github.com/duarteroso/FlaxEngine into duarteroso-bug/issue-2476

Browse Source
This commit is contained in:
Wojtek Figat
2024-04-25 19:27:11 +02:00
parent 279c80a9ae b6e36c0014
commit 75e25bf1f7
3 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Editor/Cooker/Platform/Android/AndroidPlatformTools.cpp
View File

@@ -266,9 +266,33 @@ bool AndroidPlatformTools::OnPostProcess(CookingData& data)
}
}
String versionCode = platformSettings->VersionCode;
if (versionCode.IsEmpty())
{
LOG(Error, "AndroidSettings: Invalid version code");
return true;
}
String minimumSdk = platformSettings->MinimumAPILevel;
if (minimumSdk.IsEmpty())
{
LOG(Error, "AndroidSettings: Invalid minimum API level");
return true;
}
String targetSdk = platformSettings->TargetAPILevel;
if (targetSdk.IsEmpty())
{
LOG(Error, "AndroidSettings: Invalid target API level");
return true;
}
// Format project template files
const String buildGradlePath = data.OriginalOutputPath / TEXT("app/build.gradle");
EditorUtilities::ReplaceInFile(buildGradlePath, TEXT("${PackageName}"), packageName);
EditorUtilities::ReplaceInFile(buildGradlePath, TEXT("${VersionCode}"), versionCode);
EditorUtilities::ReplaceInFile(buildGradlePath, TEXT("${MinimumSdk}"), minimumSdk);
EditorUtilities::ReplaceInFile(buildGradlePath, TEXT("${TargetSdk}"), targetSdk);
EditorUtilities::ReplaceInFile(buildGradlePath, TEXT("${ProjectVersion}"), projectVersion);
EditorUtilities::ReplaceInFile(buildGradlePath, TEXT("${PackageAbi}"), abi);
const String manifestPath = data.OriginalOutputPath / TEXT("app/src/main/AndroidManifest.xml");

18
Source/Engine/Platform/Android/AndroidPlatformSettings.h
View File

@@ -72,6 +72,24 @@ API_CLASS(sealed, Namespace="FlaxEditor.Content.Settings") class FLAXENGINE_API
API_FIELD(Attributes="EditorOrder(0), EditorDisplay(\"General\")")
String PackageName = TEXT("com.${COMPANY_NAME}.${PROJECT_NAME}");
/// <summary>
/// The application version code (eg. 1, 12, 123).
/// </summary>
API_FIELD(Attributes="EditorOrder(10), EditorDisplay(\"General\")")
String VersionCode = TEXT("1");
/// <summary>
/// The minimum Android API level(eg. 20, 28, 34).
/// </summary>
API_FIELD(Attributes = "EditorOrder(20), EditorDisplay(\"General\")")
String MinimumAPILevel = TEXT("23");
/// <summary>
/// The target Android API level(eg. 20, 28, 34).
/// </summary>
API_FIELD(Attributes = "EditorOrder(30), EditorDisplay(\"General\")")
String TargetAPILevel = TEXT("33");
/// <summary>
/// The application permissions list (eg. android.media.action.IMAGE_CAPTURE). Added to the generated manifest file.
/// </summary>

8
Source/Platforms/Android/Binaries/Project/app/build.gradle
View File

@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 24
compileSdk ${TargetSdk}
namespace "${PackageName}"
defaultConfig {
applicationId "${PackageName}"
minSdkVersion 24
targetSdkVersion 24
versionCode 1
minSdk ${MinimumSdk}
targetSdk ${TargetSdk}
versionCode ${VersionCode}
versionName "${ProjectVersion}"
ndk {
abiFilter "${PackageAbi}"