Android: maintenance (#777)

coronalabs · Feb 7, 2025 · bebe3d0 · bebe3d0
1 parent 2e34094
commit bebe3d0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/platform/android/sdk/src/com/ansca/corona/Controller.java b/platform/android/sdk/src/com/ansca/corona/Controller.java
@@ -302,7 +302,7 @@ public void run() {
 		});
 		myMediaManager.pauseAll();
 		internalSetIdleTimer(true);
-		if (Build.VERSION.SDK_INT == Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { // Android 14 does not allow for gl render
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { // Android 14+ does not allow for gl render
 			updateRuntimeState(this.myRuntime, true);
 		}
 		while (myRuntimeState == RuntimeState.Stopping) {

diff --git a/tools/CoronaBuilder/BuilderPluginDownloader.lua b/tools/CoronaBuilder/BuilderPluginDownloader.lua
@@ -422,11 +422,20 @@ function DownloadPluginsMain(args, user, buildYear, buildRevision)
 
 ]])
 
-		if forceLoad then
-			config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -force_load "$(CORONA_ROOT)/Corona/ios/lib/libplayer.a" \n')
+		if( platform == 'tvos') then
+			if forceLoad then			
+				config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -force_load \n')
+			else
+				config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -all_load \n')
+			end
 		else
-			config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -all_load -lplayer\n')
+			if forceLoad then			
+				config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -force_load "$(CORONA_ROOT)/Corona/ios/lib/libplayer.a" \n')
+			else
+				config:write('OTHER_LDFLAGS = $(inherited) $(CORONA_CUSTOM_LDFLAGS) -all_load -lplayer\n')
+			end
 		end
+
 
 		if #devConfig > 0 then
 			config:write('// device entries\n')