From a0b0a3e7bd4d1fcb5e34bfba734b2f0a6a8c4fb5 Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Tue, 11 Jun 2019 12:32:05 +0100 Subject: [PATCH] Projucer: Fixed an issue setting the fallback Android SDK path on Linux --- extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp index f4a01795db..08da017aac 100644 --- a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +++ b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp @@ -409,11 +409,12 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os) } else if (key == Ids::androidSDKPath) { - return "${user.home}/Library/Android/sdk"; + return (os == TargetOS::linux ? "${user.home}/Android/Sdk" : + "${user.home}/Library/Android/sdk"); } else if (key == Ids::androidNDKPath) { - return "${user.home}/Library/Android/sdk/ndk-bundle"; + return getFallbackPathForOS (Ids::androidSDKPath, os) + "/ndk-bundle"; } else if (key == Ids::clionExePath) {