From ede15003df6e40c5c4bd70b80968d53b91205fe8 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Mon, 22 May 2023 22:37:58 -0400
Subject: [PATCH] Bug 1834432 - Remove multidex references from firefox-android

---
 mobile/android/android-components/build.gradle | 8 --------
 mobile/android/focus-android/app/build.gradle  | 2 --
 2 files changed, 10 deletions(-)

diff --git a/mobile/android/android-components/build.gradle b/mobile/android/android-components/build.gradle
index 2dccf9e8d3c4..40a3357a9a6e 100644
--- a/mobile/android/android-components/build.gradle
+++ b/mobile/android/android-components/build.gradle
@@ -105,14 +105,6 @@ subprojects {
             }
         }
 
-        // Enforce that all (transitive) dependencies are using the same support library version as we do.
-        resolutionStrategy.eachDependency { details ->
-            if (details.requested.group == 'com.android.support'
-                    && !details.requested.name.contains('multidex') ) {
-                details.useVersion Versions.support_libraries
-            }
-        }
-
         resolutionStrategy.capabilitiesResolution.withCapability("org.mozilla.telemetry:glean-native") {
             def toBeSelected = candidates.find { it.id instanceof ModuleComponentIdentifier && it.id.module.contains('geckoview') }
             if (toBeSelected != null) {
diff --git a/mobile/android/focus-android/app/build.gradle b/mobile/android/focus-android/app/build.gradle
index f580a457fbf7..859ef6501b40 100644
--- a/mobile/android/focus-android/app/build.gradle
+++ b/mobile/android/focus-android/app/build.gradle
@@ -35,8 +35,6 @@ android {
         buildConfigField "String", "GIT_HASH", "\"\""
 
         vectorDrawables.useSupportLibrary = true
-
-        multiDexEnabled true
     }
 
     compileOptions {
-- 
2.11.4.GIT