diff --git a/Source/Platforms/Android/Binaries/Project/app/src/main/java/com/flaxengine/GameActivity.java b/Source/Platforms/Android/Binaries/Project/app/src/main/java/com/flaxengine/GameActivity.java index bee34b99d..2a7fc8631 100644 --- a/Source/Platforms/Android/Binaries/Project/app/src/main/java/com/flaxengine/GameActivity.java +++ b/Source/Platforms/Android/Binaries/Project/app/src/main/java/com/flaxengine/GameActivity.java @@ -44,7 +44,7 @@ public class GameActivity extends NativeActivity { static { try { // Load native libraries - System.loadLibrary("FlaxEngine"); + System.loadLibrary("FlaxGame"); } catch (UnsatisfiedLinkError error) { Log.e("Flax", error.getMessage()); } diff --git a/Source/Tools/Flax.Build/Build/EngineTarget.cs b/Source/Tools/Flax.Build/Build/EngineTarget.cs index 8e6f0fd06..ae3fda23b 100644 --- a/Source/Tools/Flax.Build/Build/EngineTarget.cs +++ b/Source/Tools/Flax.Build/Build/EngineTarget.cs @@ -128,7 +128,7 @@ namespace Flax.Build base.PostBuild(graph, buildOptions); // If building engine executable for platform doesn't support referencing it when linking game shared libraries - if (UseSeparateMainExecutable(buildOptions) && !BuildAsLibrary(buildOptions)) + if (UseSeparateMainExecutable(buildOptions)) { // Build additional executable with Main module only that uses shared library using (new ProfileEventScope("BuildExecutable")) @@ -148,6 +148,8 @@ namespace Flax.Build { if (OutputType == TargetOutputType.Executable && !Configuration.BuildBindingsOnly) { + if (buildOptions.Platform.Target == TargetPlatform.Android) + return false; if (!buildOptions.Platform.HasModularBuildSupport) return false; return !IsMonolithicExecutable || (!buildOptions.Platform.HasExecutableFileReferenceSupport && UseSymbolsExports); @@ -159,8 +161,7 @@ namespace Flax.Build { switch (buildOptions.Platform.Target) { - case TargetPlatform.UWP: - case TargetPlatform.Android: return true; + case TargetPlatform.UWP: return true; default: return false; } }