Improve building for Android

This commit is contained in:
Wojtek Figat
2023-02-14 15:27:13 +01:00
parent 752fa64cc3
commit 47afc7817f
2 changed files with 12 additions and 7 deletions

View File

@@ -289,13 +289,14 @@ bool AndroidPlatformTools::OnPostProcess(CookingData& data)
return true;
}
String androidSdk;
if (!envVars.TryGet(TEXT("ANDROID_SDK"), androidSdk) || !FileSystem::DirectoryExists(androidSdk))
if (!envVars.TryGet(TEXT("ANDROID_HOME"), androidSdk) || !FileSystem::DirectoryExists(androidSdk))
{
LOG(Error, "Missing or invalid ANDROID_SDK env variable. {0}", androidSdk);
return true;
if (!envVars.TryGet(TEXT("ANDROID_SDK"), androidSdk) || !FileSystem::DirectoryExists(androidSdk))
{
LOG(Error, "Missing or invalid ANDROID_HOME env variable. {0}", androidSdk);
return true;
}
}
if (!envVars.ContainsKey(TEXT("ANDROID_SDK_ROOT")))
envVars[TEXT("ANDROID_SDK_ROOT")] = androidSdk;
// Build Gradle project into package
LOG(Info, "Building Gradle project into package...");