From 53ce8ebfbddb09fac8e7b5196b32094a3fc2b778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= <antti.maatta@qt.io>
Date: Tue, 31 Jan 2023 07:55:55 +0200
Subject: [PATCH] Add Q_TRACE_LOCATION to android support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is needed for tracing android devices.

Change-Id: Ic04e15b43b426bdb1232e671acb4163165eab666
Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
(cherry picked from commit 5ae8417c4f6348ab9f78a93fbb83e0c27c57d288)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../java/src/org/qtproject/qt/android/bindings/QtLoader.java | 5 +++++
 src/android/templates/AndroidManifest.xml                    | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
index baa4062372c..dcb09415567 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
@@ -344,6 +344,11 @@ public abstract class QtLoader {
 
                 ENVIRONMENT_VARIABLES += "\tANDROID_STYLE_PATH=" + stylePath;
 
+                if (m_contextInfo.metaData.containsKey("android.app.trace_location")) {
+                    String loc = m_contextInfo.metaData.getString("android.app.trace_location");
+                    ENVIRONMENT_VARIABLES += "\tQTRACE_LOCATION="+loc;
+                }
+
                 loaderParams.putString(ENVIRONMENT_VARIABLES_KEY, ENVIRONMENT_VARIABLES);
 
                 String appParams = null;
diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml
index d7438317b89..762acaf84e6 100644
--- a/src/android/templates/AndroidManifest.xml
+++ b/src/android/templates/AndroidManifest.xml
@@ -42,6 +42,9 @@
             <meta-data
                 android:name="android.app.extract_android_style"
                 android:value="minimal" />
+            <meta-data
+                android:name="android.app.trace_location"
+                android:value="/sdcard/Android/data/trace" />
         </activity>
     </application>
 </manifest>