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

re-add returns to aab

Browse Source
This commit is contained in:
Chandler Cox
2025-01-13 07:30:01 -06:00
parent 563f0b9ab4
commit 55fa372197
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,16 +375,19 @@ bool AndroidPlatformTools::OnPostProcess(CookingData& data)
const int32 result = Platform::CreateProcess(procSettings); const int32 result = Platform::CreateProcess(procSettings);
if (result != 0) if (result != 0)
{ {
data.Error(String::Format(TEXT("Failed to build Gradle project into package (result code: {0}). See log for more info."), result)); data.Error(String::Format(TEXT("Failed to build Gradle project into .aab package (result code: {0}). See log for more info."), result));
return true;
} }
} }
// Copy result package // Copy result package
const String aab = data.OriginalOutputPath / (distributionPackage ? TEXT("app/build/outputs/bundle/release/app-release.aab") : TEXT("app/build/outputs/bundle/debug/app-debug.aab")); const String aab = data.OriginalOutputPath / (distributionPackage ? TEXT("app/build/outputs/bundle/release/app-release.aab") : TEXT("app/build/outputs/bundle/debug/app-debug.aab"));
const String outputAab = data.OriginalOutputPath / EditorUtilities::GetOutputName() + TEXT(".aab"); const String outputAab = data.OriginalOutputPath / EditorUtilities::GetOutputName() + TEXT(".aab");
if (FileSystem::CopyFile(outputAab, aab)) if (FileSystem::CopyFile(outputAab, aab))
LOG(Error, "Failed to copy package from {0} to {1}", aab, outputAab); {
else LOG(Error, "Failed to copy .aab package from {0} to {1}", aab, outputAab);
LOG(Info, "Output AAB Android application package: {0} (size: {1} MB)", outputAab, FileSystem::GetFileSize(outputAab) / 1024 / 1024); return true;
}
LOG(Info, "Output Android AAB application package: {0} (size: {1} MB)", outputAab, FileSystem::GetFileSize(outputAab) / 1024 / 1024);
} }
// .apk // .apk
@@ -395,7 +398,7 @@ bool AndroidPlatformTools::OnPostProcess(CookingData& data)
const int32 result = Platform::CreateProcess(procSettings); const int32 result = Platform::CreateProcess(procSettings);
if (result != 0) if (result != 0)
{ {
data.Error(String::Format(TEXT("Failed to build Gradle project into package (result code: {0}). See log for more info."), result)); data.Error(String::Format(TEXT("Failed to build Gradle project into .apk package (result code: {0}). See log for more info."), result));
return true; return true;
} }
} }
@@ -404,7 +407,7 @@ bool AndroidPlatformTools::OnPostProcess(CookingData& data)
const String outputApk = data.OriginalOutputPath / EditorUtilities::GetOutputName() + TEXT(".apk"); const String outputApk = data.OriginalOutputPath / EditorUtilities::GetOutputName() + TEXT(".apk");
if (FileSystem::CopyFile(outputApk, apk)) if (FileSystem::CopyFile(outputApk, apk))
{ {
LOG(Error, "Failed to copy package from {0} to {1}", apk, outputApk); LOG(Error, "Failed to copy .apk package from {0} to {1}", apk, outputApk);
return true; return true;
} }
LOG(Info, "Output Android APK application package: {0} (size: {1} MB)", outputApk, FileSystem::GetFileSize(outputApk) / 1024 / 1024); LOG(Info, "Output Android APK application package: {0} (size: {1} MB)", outputApk, FileSystem::GetFileSize(outputApk) / 1024 / 1024);