From 2d9725b89d0e2a62561e717876e24b141dc0731f Mon Sep 17 00:00:00 2001 From: Fredia Huya-Kouadio Date: Fri, 24 Apr 2020 04:21:36 -0700 Subject: [PATCH] Fix detection logic for the Android sdk path The previous logic used the 'tools' directory within the Android sdk to validate it. That directory was recently deprecated and removed from the Android sdk folder (https://developer.android.com/studio/releases/sdk-tools) (cherry picked from commit 328354f87874ece0ee3b0e6cd35e82b007e51b3c) --- platform/android/export/export.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 78f282d2f5c..a08f87ecd42 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1717,7 +1717,7 @@ public: valid = false; } else { Error errn; - DirAccessRef da = DirAccess::open(sdk_path.plus_file("tools"), &errn); + DirAccessRef da = DirAccess::open(sdk_path.plus_file("platform-tools"), &errn); if (errn != OK) { err += TTR("Invalid Android SDK path for custom build in Editor Settings.") + "\n"; valid = false;