Update lua-https to love2d/lua-https@5b6ecab.

love2d · Jan 30, 2025 · dc1fca3 · dc1fca3
1 parent a53d68b
commit dc1fca3
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/libraries/luahttps/src/android/AndroidClient.cpp b/src/libraries/luahttps/src/android/AndroidClient.cpp
@@ -53,10 +53,17 @@ AndroidClient::AndroidClient()
 : HTTPSClient()
 {
 	LibraryLoader::handle *library = LibraryLoader::GetCurrentProcessHandle();
-	// Look for SDL_AndroidGetJNIEnv
-	LibraryLoader::LoadSymbol(SDL_AndroidGetJNIEnv, library, "SDL_AndroidGetJNIEnv");
-	// Look for SDL_AndroidGetActivity
-	LibraryLoader::LoadSymbol(SDL_AndroidGetActivity, library, "SDL_AndroidGetActivity");
+
+	// Look for SDL_GetAndroidJNIEnv and SDL_GetAndroidActivity (SDL3)
+	if (
+		!LibraryLoader::LoadSymbol(SDL_AndroidGetJNIEnv, library, "SDL_GetAndroidJNIEnv") &&
+		!LibraryLoader::LoadSymbol(SDL_AndroidGetActivity, library, "SDL_GetAndroidActivity")
+	)
+	{
+		// Probably running SDL2.
+		LibraryLoader::LoadSymbol(SDL_AndroidGetJNIEnv, library, "SDL_AndroidGetJNIEnv");
+		LibraryLoader::LoadSymbol(SDL_AndroidGetActivity, library, "SDL_AndroidGetActivity");
+	}
 }
 
 bool AndroidClient::valid() const