diff --git a/libs/utils/include/private/utils/Tracing.h b/libs/utils/include/private/utils/Tracing.h
index 9ea253499e..4c872d1f1f 100644
--- a/libs/utils/include/private/utils/Tracing.h
+++ b/libs/utils/include/private/utils/Tracing.h
@@ -30,9 +30,9 @@
 #   define FILAMENT_APPLE_SYSTRACE 0
 #endif
 
-#if defined(__ANDROID__)
+#if defined(__ANDROID__) && FILAMENT_TRACING_ENABLED
 #    include <private/utils/android/Tracing.h>
-#elif defined(__APPLE__) && FILAMENT_APPLE_SYSTRACE
+#elif defined(__APPLE__) && FILAMENT_APPLE_SYSTRACE && FILAMENT_TRACING_ENABLED
 #    include <private/utils/darwin/Tracing.h>
 #else
 
diff --git a/libs/utils/src/JobSystem.cpp b/libs/utils/src/JobSystem.cpp
index 179796921c..8733fb96ce 100644
--- a/libs/utils/src/JobSystem.cpp
+++ b/libs/utils/src/JobSystem.cpp
@@ -14,8 +14,13 @@
  * limitations under the License.
  */
 
+// TODO: Clean-up. We shouldn't need this #ifndef here, but a client has requested that perfetto be
+// disabled due to size increase.  In their case, this flag would be defined across targets. Hence
+// we guard below with an #ifndef.
+#ifndef FILAMENT_TRACING_ENABLED
 // Note: The overhead of TRACING is not negligible especially with parallel_for().
 #define FILAMENT_TRACING_ENABLED false
+#endif
 
 // when FILAMENT_TRACING_ENABLED is true, enables even heavier tracing
 #define HEAVY_TRACING  0