tor-browser

commit 7db4be187b8b76d1894cc14c1a98e70ed5ee0f2d
parent 3bf7fc2b2be671c7861c3bfe48a4f94c203ce50e
Author: Alex Hochheiden <ahochheiden@mozilla.com>
Date:   Sun, 14 Dec 2025 07:46:30 +0000

Bug 2005888 - Update `compile-all` to account for Fenix product flavor removal r=tcampbell,geckoview-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D276351

Diffstat:
M
mobile/android/gradle.configure
 | 
24
+++++++++++++++---------

1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/mobile/android/gradle.configure b/mobile/android/gradle.configure
@@ -596,19 +596,25 @@ def gradle_android_compile_all_tasks(build_config):
         f"compileTestKotlin",
     ]
 
-    # "" is for GeckoView
-    for app in ["", "Fenix", "Focus", "Klar"]:
+    # Apps without product flavors (GeckoView, Fenix) use just `buildType` in task names
+    tasks += [
+        f"compile{buildType}Sources",
+        f"compile{buildType}UnitTestSources",
+    ]
+
+    # Apps with product flavors include `flavor` name and `buildType` in task names
+    for flavor in ["Focus", "Klar"]:
         tasks += [
-            f"compile{app}{buildType}Sources",
-            f"compile{app}{buildType}UnitTestSources",
+            f"compile{flavor}{buildType}Sources",
+            f"compile{flavor}{buildType}UnitTestSources",
         ]
 
-    # those tasks do not appear to have a Release variant
+    # These tasks do not appear to have a Release variant
     if buildType == "Debug":
-        for app in ["", "Fenix", "Focus", "Klar"]:
-            tasks += [
-                f"compile{app}{buildType}AndroidTestSources",
-            ]
+        tasks += [f"compile{buildType}AndroidTestSources"]
+
+        for flavor in ["Focus", "Klar"]:
+            tasks += [f"compile{flavor}{buildType}AndroidTestSources"]
 
         for app in ["Gecko", "System"]:
             tasks += [