From 0b9f33b4af960066ea41023ab894cc321c0dcfe2 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 13 Jul 2021 13:02:16 +0200
Subject: [PATCH] Disable Tracy profiler on Android

---
 Source/Engine/Level/Scene/SceneRendering.cpp | 10 ++++++++++
 Source/Engine/Profiler/Profiler.Build.cs     |  2 +-
 Source/ThirdParty/tracy/Tracy.h              |  3 +--
 Source/ThirdParty/tracy/TracyClient.cpp      |  4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Source/Engine/Level/Scene/SceneRendering.cpp b/Source/Engine/Level/Scene/SceneRendering.cpp
index 8e39b3043..f9dc133d2 100644
--- a/Source/Engine/Level/Scene/SceneRendering.cpp
+++ b/Source/Engine/Level/Scene/SceneRendering.cpp
@@ -168,7 +168,9 @@ void SceneRendering::DrawEntries::CullAndDraw(RenderContext& renderContext)
         {
 #if SCENE_RENDERING_USE_PROFILER
             PROFILE_CPU();
+#if TRACY_ENABLE
             ___tracy_scoped_zone.Name(*e.Actor->GetName(), e.Actor->GetName().Length());
+#endif
 #endif
             e.Actor->Draw(renderContext);
         }
@@ -181,7 +183,9 @@ void SceneRendering::DrawEntries::CullAndDraw(RenderContext& renderContext)
         {
 #if SCENE_RENDERING_USE_PROFILER
             PROFILE_CPU();
+#if TRACY_ENABLE
             ___tracy_scoped_zone.Name(*e.Actor->GetName(), e.Actor->GetName().Length());
+#endif
 #endif
             e.Actor->Draw(renderContext);
         }
@@ -289,7 +293,9 @@ void SceneRendering::DrawEntries::CullAndDrawOffline(RenderContext& renderContex
         {
 #if SCENE_RENDERING_USE_PROFILER
             PROFILE_CPU();
+#if TRACY_ENABLE
             ___tracy_scoped_zone.Name(*e.Actor->GetName(), e.Actor->GetName().Length());
+#endif
 #endif
             e.Actor->Draw(renderContext);
         }
@@ -302,7 +308,9 @@ void SceneRendering::DrawEntries::CullAndDrawOffline(RenderContext& renderContex
         {
 #if SCENE_RENDERING_USE_PROFILER
             PROFILE_CPU();
+#if TRACY_ENABLE
             ___tracy_scoped_zone.Name(*e.Actor->GetName(), e.Actor->GetName().Length());
+#endif
 #endif
             e.Actor->Draw(renderContext);
         }
@@ -350,7 +358,9 @@ void SceneRendering::Draw(RenderContext& renderContext)
                 {
 #if SCENE_RENDERING_USE_PROFILER
                     PROFILE_CPU();
+#if TRACY_ENABLE
                     ___tracy_scoped_zone.Name(*actor->GetName(), actor->GetName().Length());
+#endif
 #endif
                     actor->Draw(renderContext);
                 }
diff --git a/Source/Engine/Profiler/Profiler.Build.cs b/Source/Engine/Profiler/Profiler.Build.cs
index 660be038c..64ac34324 100644
--- a/Source/Engine/Profiler/Profiler.Build.cs
+++ b/Source/Engine/Profiler/Profiler.Build.cs
@@ -31,8 +31,8 @@ public class Profiler : EngineModule
         // Tracy profiling tools
         switch (options.Platform.Target)
         {
+        case TargetPlatform.Android: // dlopen failed: cannot locate symbol `tracy::ScopedZone::~ScopedZone()` referenced by "libFlaxGame.so"
         case TargetPlatform.Windows:
-        case TargetPlatform.Android:
             options.PublicDependencies.Add("tracy");
             break;
         }
diff --git a/Source/ThirdParty/tracy/Tracy.h b/Source/ThirdParty/tracy/Tracy.h
index cb115740f..0b3469cd5 100644
--- a/Source/ThirdParty/tracy/Tracy.h
+++ b/Source/ThirdParty/tracy/Tracy.h
@@ -1,8 +1,6 @@
 #ifndef __TRACY_HPP__
 #define __TRACY_HPP__
 
-#include "common/TracySystem.hpp"
-
 #ifndef TRACY_ENABLE
 
 #define ZoneNamed(x,y)
@@ -84,6 +82,7 @@
 
 #include <string.h>
 
+#include "common/TracySystem.hpp"
 #include "client/TracyCallstack.h"
 
 namespace tracy
diff --git a/Source/ThirdParty/tracy/TracyClient.cpp b/Source/ThirdParty/tracy/TracyClient.cpp
index dd56765c1..7e170e5de 100644
--- a/Source/ThirdParty/tracy/TracyClient.cpp
+++ b/Source/ThirdParty/tracy/TracyClient.cpp
@@ -11,10 +11,10 @@
 
 // Define TRACY_ENABLE to enable profiler.
 
-#include "common/TracySystem.cpp"
-
 #ifdef TRACY_ENABLE
 
+#include "common/TracySystem.cpp"
+
 #ifdef _MSC_VER
 #  pragma warning(push, 0)
 #endif