Bug 1610656 - Kill the `geckoViewBinaries` product flavor. r=geckoview-reviewers,android-reviewers,nalexander,ohall

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

mobile/android/android-components/samples/browser/build.gradle

@@ -9,10 +9,6 @@ if (findProject(":geckoview") != null) {
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-if (findProject(":geckoview") != null) {
-    apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle"
-}
-
 android {
     defaultConfig {
         applicationId "org.mozilla.samples.browser"
@@ -34,11 +30,6 @@ android {
         }
     }
 
-    if (findProject(":geckoview") != null) {
-        project.configureProductFlavors.delegate = it
-        project.configureProductFlavors()
-    }
-
     flavorDimensions += "engine"
 
     productFlavors {

mobile/android/examples/messaging_example/app/build.gradle

@@ -3,8 +3,6 @@ buildDir "${topobjdir}/gradle/build/mobile/android/examples/messaging_example"
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle"
-
 android {
     buildToolsVersion project.ext.buildToolsVersion
     compileSdkVersion project.ext.compileSdkVersion
@@ -33,9 +31,6 @@ android {
         noCompress 'ja'
     }
 
-    project.configureProductFlavors.delegate = it
-    project.configureProductFlavors()
-
     namespace 'org.mozilla.geckoview.example.messaging'
 }
 

mobile/android/examples/port_messaging_example/app/build.gradle

@@ -3,8 +3,6 @@ buildDir "${topobjdir}/gradle/build/mobile/android/examples/port_messaging_examp
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle"
-
 android {
     buildToolsVersion project.ext.buildToolsVersion
     compileSdkVersion project.ext.compileSdkVersion
@@ -33,9 +31,6 @@ android {
         noCompress 'ja'
     }
 
-    project.configureProductFlavors.delegate = it
-    project.configureProductFlavors()
-
     namespace 'org.mozilla.geckoview.example.messaging'
 }
 

mobile/android/fenix/app/build.gradle

@@ -35,10 +35,6 @@ apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 apply plugin: 'kotlinx-serialization'
 
-if (findProject(":geckoview") != null) {
-    apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle"
-}
-
 import groovy.json.JsonOutput
 import org.gradle.internal.logging.text.StyledTextOutput.Style
 import org.gradle.internal.logging.text.StyledTextOutputFactory
@@ -218,11 +214,6 @@ android {
         animationsDisabled = true
     }
 
-    if (findProject(":geckoview") != null) {
-        project.configureProductFlavors.delegate = it
-        project.configureProductFlavors()
-    }
-
     flavorDimensions.add("product")
 
     productFlavors {
@@ -542,16 +533,6 @@ nimbus {
             fenixBeta: "beta",
             fenixRelease: "release",
             fenixBenchmark: "developer",
-            withGeckoBinariesFenixDebug: "developer",
-            withGeckoBinariesFenixNightly: "nightly",
-            withGeckoBinariesFenixBeta: "beta",
-            withGeckoBinariesFenixRelease: "release",
-            withGeckoBinariesFenixBenchmark: "developer",
-            withoutGeckoBinariesFenixDebug: "developer",
-            withoutGeckoBinariesFenixNightly: "nightly",
-            withoutGeckoBinariesFenixBeta: "beta",
-            withoutGeckoBinariesFenixRelease: "release",
-            withoutGeckoBinariesFenixBenchmark: "developer",
     ]
     // This is generated by the FML and should be checked into git.
     // It will be fetched by Experimenter (the Nimbus experiment website)

mobile/android/focus-android/app/build.gradle

@@ -18,10 +18,6 @@ if (findProject(":geckoview") != null) {
 }
 apply from: versionCodeGradle
 
-if (findProject(":geckoview") != null) {
-    apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle"
-}
-
 import com.android.build.api.variant.FilterConfiguration
 import groovy.json.JsonOutput
 import org.gradle.internal.logging.text.StyledTextOutput.Style
@@ -130,11 +126,6 @@ android {
         kotlinCompilerExtensionVersion = Versions.compose_compiler
     }
 
-    if (findProject(":geckoview") != null) {
-        project.configureProductFlavors.delegate = it
-        project.configureProductFlavors()
-    }
-
     flavorDimensions.add("product")
 
     productFlavors {
@@ -177,37 +168,17 @@ android {
             }
         }
 
-        if (findProject(":geckoview") != null) {
-            // Release
-            withGeckoBinariesFocusRelease.root = 'src/focusRelease'
-            withGeckoBinariesKlarRelease.root = 'src/klarRelease'
-            withoutGeckoBinariesFocusRelease.root = 'src/focusRelease'
-            withoutGeckoBinariesKlarRelease.root = 'src/klarRelease'
+        // Release
+        focusRelease.root = 'src/focusRelease'
+        klarRelease.root = 'src/klarRelease'
 
-            // Debug
-            withGeckoBinariesFocusDebug.root = 'src/focusDebug'
-            withGeckoBinariesKlarDebug.root = 'src/klarDebug'
-            withoutGeckoBinariesFocusDebug.root = 'src/focusDebug'
-            withoutGeckoBinariesKlarDebug.root = 'src/klarDebug'
+        // Debug
+        focusDebug.root = 'src/focusDebug'
+        klarDebug.root = 'src/klarDebug'
 
-            // Nightly
-            withGeckoBinariesFocusNightly.root = 'src/focusNightly'
-            withGeckoBinariesKlarNightly.root = 'src/klarNightly'
-            withoutGeckoBinariesFocusNightly.root = 'src/focusNightly'
-            withoutGeckoBinariesKlarNightly.root = 'src/klarNightly'
-        } else {
-            // Release
-            focusRelease.root = 'src/focusRelease'
-            klarRelease.root = 'src/klarRelease'
-
-            // Debug
-            focusDebug.root = 'src/focusDebug'
-            klarDebug.root = 'src/klarDebug'
-
-            // Nightly
-            focusNightly.root = 'src/focusNightly'
-            klarNightly.root = 'src/klarNightly'
-        }
+        // Nightly
+        focusNightly.root = 'src/focusNightly'
+        klarNightly.root = 'src/klarNightly'
     }
     packagingOptions {
         resources {
@@ -252,22 +223,6 @@ nimbus {
             klarNightly: "nightly",
             klarBeta: "beta",
             klarRelease: "release",
-            withGeckoBinariesFocusDebug: "debug",
-            withGeckoBinariesFocusNightly: "nightly",
-            withGeckoBinariesFocusBeta: "beta",
-            withGeckoBinariesFocusRelease: "release",
-            withGeckoBinariesKlarDebug: "debug",
-            withGeckoBinariesKlarNightly: "nightly",
-            withGeckoBinariesKlarBeta: "beta",
-            withGeckoBinariesKlarRelease: "release",
-            withoutGeckoBinariesFocusDebug: "debug",
-            withoutGeckoBinariesFocusNightly: "nightly",
-            withoutGeckoBinariesFocusBeta: "beta",
-            withoutGeckoBinariesFocusRelease: "release",
-            withoutGeckoBinariesKlarDebug: "debug",
-            withoutGeckoBinariesKlarNightly: "nightly",
-            withoutGeckoBinariesKlarBeta: "beta",
-            withoutGeckoBinariesKlarRelease: "release",
     ]
     // This is generated by the FML and should be checked into git.
     // It will be fetched by Experimenter (the Nimbus experiment website)

mobile/android/geckoview/build.gradle

@@ -6,8 +6,6 @@ apply plugin: 'com.android.library'
 apply plugin: 'checkstyle'
 apply plugin: 'kotlin-android'
 
-apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle"
-
 // The SDK binding generation tasks depend on the JAR creation task of the
 // :annotations project.
 evaluationDependsOn(':annotations')
@@ -80,9 +78,6 @@ android {
         buildConfigField 'boolean', 'MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS', mozconfig.substs.MOZ_ANDROID_CONTENT_SERVICE_ISOLATED_PROCESS ? 'true' : 'false';
     }
 
-    project.configureProductFlavors.delegate = it
-    project.configureProductFlavors()
-
     lintOptions {
         abortOnError false
     }
@@ -116,19 +111,6 @@ android {
                 }
             }
 
-            assets {
-            }
-
-            debug {
-                manifest.srcFile "${topobjdir}/mobile/android/geckoview/src/main/AndroidManifest_overlay.xml"
-            }
-
-            release {
-                manifest.srcFile "${topobjdir}/mobile/android/geckoview/src/main/AndroidManifest_overlay.xml"
-            }
-        }
-
-        withGeckoBinaries {
             assets {
                 // This should contain only `omni.ja`.
                 srcDir "${topobjdir}/dist/geckoview/assets"
@@ -141,6 +123,14 @@ android {
                     srcDir "${topobjdir}/dist/fat-aar/output/jni"
                 }
             }
+
+            debug {
+                manifest.srcFile "${topobjdir}/mobile/android/geckoview/src/main/AndroidManifest_overlay.xml"
+            }
+
+            release {
+                manifest.srcFile "${topobjdir}/mobile/android/geckoview/src/main/AndroidManifest_overlay.xml"
+            }
         }
     }
 
@@ -150,7 +140,7 @@ android {
     }
 
     publishing {
-        singleVariant('withGeckoBinariesDebug')
+        singleVariant('debug')
     }
 
     namespace 'org.mozilla.geckoview'
@@ -195,7 +185,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
 }
 
 configurations {
-    withGeckoBinariesApi {
+    api {
         outgoing {
             if (!mozconfig.substs.MOZ_ANDROID_GECKOVIEW_LITE) {
                 // The omni build provides glean-native
@@ -211,7 +201,7 @@ configurations {
     // The variant resolver _should_ pick the RuntimeOnly configuration when building
     // the tests as those define the implicit :geckoview capability but it doesn't,
     // so we manually define it here.
-    withGeckoBinariesRuntimeOnly {
+    runtimeOnly {
         outgoing {
             afterEvaluate {
                 // Implicit capability
@@ -252,11 +242,7 @@ dependencies {
 apply from: "${topsrcdir}/mobile/android/gradle/with_gecko_binaries.gradle"
 
 android.libraryVariants.all { variant ->
-    // See the notes in mobile/android/app/build.gradle for details on including
-    // Gecko binaries and the Omnijar.
-    if ((variant.productFlavors*.name).contains('withGeckoBinaries')) {
-        configureVariantWithGeckoBinaries(variant)
-    }
+    configureVariantWithGeckoBinaries(variant)
 
     // Javadoc and Sources JAR configuration cribbed from
     // https://github.com/mapbox/mapbox-gl-native/blob/d169ea55c1cfa85cd8bf19f94c5f023569f71810/platform/android/MapboxGLAndroidSDK/build.gradle#L85
@@ -455,21 +441,18 @@ publishing {
     }
 }
 
-// This is all related to the withGeckoBinaries approach; see
-// mobile/android/gradle/with_gecko_binaries.gradle.
 afterEvaluate {
     // The bundle tasks are only present when the particular configuration is
     // being built, so this task might not exist.  (This is due to the way the
     // Android Gradle plugin defines things during configuration.)
-    def bundleWithGeckoBinaries = tasks.findByName('bundleWithGeckoBinariesReleaseAar')
-    if (!bundleWithGeckoBinaries) {
+    def bundle = tasks.findByName('bundleReleaseAar')
+    if (!bundle) {
         return
     }
 
     // Remove default configuration, which is the release configuration, when
-    // we're actually building withGeckoBinaries.  This makes `gradle install`
-    // install the withGeckoBinaries artifacts, not the release artifacts (which
-    // are withoutGeckoBinaries and not suitable for distribution.)
+    // building.  This makes `gradle install` install the deubg artifacts, not
+    // the release artifacts (which are not suitable for distribution.)
     def Configuration archivesConfig = project.getConfigurations().getByName('archives')
     archivesConfig.artifacts.removeAll { it.extension.equals('aar') }
 

mobile/android/geckoview_example/build.gradle

@@ -3,8 +3,6 @@ buildDir "${topobjdir}/gradle/build/mobile/android/geckoview_example"
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle"
-
 android {
     buildToolsVersion project.ext.buildToolsVersion
     compileSdkVersion project.ext.compileSdkVersion
@@ -36,9 +34,6 @@ android {
         noCompress 'ja'
     }
 
-    project.configureProductFlavors.delegate = it
-    project.configureProductFlavors()
-
     buildFeatures {
         buildConfig true
     }

mobile/android/gradle.configure

@@ -58,20 +58,19 @@ def gradle_android_build_config():
         else:
             return s
 
-    def variant(productFlavors, buildType):
+    def variant(buildType):
         return namespace(
-            productFlavors=productFlavors,
             buildType=buildType,
-            # Like 'WithoutGeckoBinariesDebug'
-            name="".join(capitalize(t) for t in chain(productFlavors, (buildType,))),
+            # Like 'Debug'
+            name="".join(capitalize(t) for t in chain((buildType,))),
         )
 
     return namespace(
         geckoview=namespace(
-            variant=variant(("withGeckoBinaries",), "debug"),
+            variant=variant("debug"),
         ),
         geckoview_example=namespace(
-            variant=variant(("withGeckoBinaries",), "debug"),
+            variant=variant("debug"),
         ),
     )
 
@@ -93,14 +92,10 @@ def gradle_android_intermediates_folder(build_config):
         else:
             return s
 
-    productFlavor = uncapitalize(
-        "".join(capitalize(f) for f in build_config.geckoview.variant.productFlavors)
-    )
     buildType = uncapitalize(build_config.geckoview.variant.buildType)
 
-    return "gradle/build/mobile/android/geckoview/intermediates/javac/{}{}".format(
-        productFlavor,
-        capitalize(buildType),
+    return "gradle/build/mobile/android/geckoview/intermediates/javac/{}".format(
+        buildType,
     )
 
 
@@ -126,15 +121,11 @@ def gradle_android_geckoview_test_runner_bundle(build_config):
         else:
             return s
 
-    productFlavor = uncapitalize(
-        "".join(capitalize(f) for f in build_config.geckoview.variant.productFlavors)
-    )
     buildType = uncapitalize(build_config.geckoview.variant.buildType)
     variant = uncapitalize(build_config.geckoview.variant.name)
 
-    return "gradle/build/mobile/android/test_runner/outputs/bundle/{}/test_runner-{}-{}.aab".format(
+    return "gradle/build/mobile/android/test_runner/outputs/bundle/{}/test_runner-{}.aab".format(
         variant,
-        productFlavor,
         buildType,
     )
 
@@ -162,15 +153,11 @@ def gradle_android_geckoview_example_bundle(build_config):
         else:
             return s
 
-    productFlavor = uncapitalize(
-        "".join(capitalize(f) for f in build_config.geckoview.variant.productFlavors)
-    )
     buildType = uncapitalize(build_config.geckoview.variant.buildType)
     variant = uncapitalize(build_config.geckoview.variant.name)
 
-    return "gradle/build/mobile/android/geckoview_example/outputs/bundle/{}/geckoview_example-{}-{}.aab".format(
+    return "gradle/build/mobile/android/geckoview_example/outputs/bundle/{}/geckoview_example-{}.aab".format(
         variant,
-        productFlavor,
         buildType,
     )
 
@@ -182,7 +169,7 @@ set_config(
 
 @depends(gradle_android_build_config)
 def gradle_android_variant_name(build_config):
-    """Like "withoutGeckoBinariesDebug"."""
+    """Like "Debug"."""
 
     def uncapitalize(s):
         if s:
@@ -605,10 +592,7 @@ def gradle_android_dependencies_tasks(*tasks):
 
     # The union, plus a bit more, of all of the Gradle tasks
     # invoked by the android-* automation jobs.
-    def withoutGeckoBinaries(task):
-        return task.replace("withGeckoBinaries", "withoutGeckoBinaries")
-
-    return list(withoutGeckoBinaries(t) for t in chain(*tasks))
+    return list(t for t in chain(*tasks))
 
 
 set_config("GRADLE_ANDROID_DEPENDENCIES_TASKS", gradle_android_dependencies_tasks)

mobile/android/gradle/product_flavors.gradle

@@ -1,17 +0,0 @@
-/* -*- Mode: Groovy; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-ext.configureProductFlavors = {
-    flavorDimensions "geckoBinaries"
-    productFlavors {
-        withGeckoBinaries {
-            dimension "geckoBinaries"
-        }
-
-        withoutGeckoBinaries {
-            dimension "geckoBinaries"
-        }
-    }
-}

mobile/android/gradle/with_gecko_binaries.gradle

@@ -24,7 +24,7 @@ ext.configureVariantWithGeckoBinaries = { variant ->
         // the moz.build system and should never be re-entrant in this way.
         def assetGenTask = tasks.findByName("generate${variant.name.capitalize()}Assets")
         def jniLibFoldersTask = tasks.findByName("merge${variant.name.capitalize()}JniLibFolders")
-        if (!mozconfig.substs.MOZILLA_OFFICIAL && (variant.productFlavors*.name).contains('withGeckoBinaries')) {
+        if (!mozconfig.substs.MOZILLA_OFFICIAL) {
             assetGenTask.dependsOn rootProject.machStagePackage
             jniLibFoldersTask.dependsOn rootProject.machStagePackage
         }

mobile/android/test_runner/build.gradle

@@ -3,8 +3,6 @@ buildDir "${topobjdir}/gradle/build/mobile/android/test_runner"
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-apply from: "${topsrcdir}/mobile/android/gradle/product_flavors.gradle"
-
 android {
     buildToolsVersion project.ext.buildToolsVersion
     compileSdkVersion project.ext.compileSdkVersion
@@ -36,9 +34,6 @@ android {
         noCompress 'ja'
     }
 
-    project.configureProductFlavors.delegate = it
-    project.configureProductFlavors()
-
     namespace 'org.mozilla.geckoview.test_runner'
 }
 

taskcluster/kinds/build-fat-aar/kind.yml

@@ -45,19 +45,19 @@ task-defaults:
               path: /builds/worker/artifacts/
               type: directory
             - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/debug/geckoview-debug-androidTest.apk
               type: file
             - name: public/build/geckoview-test_runner.apk
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/withGeckoBinaries/debug/test_runner-withGeckoBinaries-debug.apk
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/debug/test_runner-debug.apk
               type: file
             - name: public/build/geckoview-test_runner.aab
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/withGeckoBinariesDebug/test_runner-withGeckoBinaries-debug.aab
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/debug/test_runner-debug.aab
               type: file
             - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/debug/geckoview_example-debug.apk
               type: file
             - name: public/build/geckoview_example.aab
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/withGeckoBinariesDebug/geckoview_example-withGeckoBinaries-debug.aab
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/debug/geckoview_example-debug.aab
               type: file
             - name: public/build/mozconfig
               path: /builds/worker/workspace/obj-build/.mozconfig

taskcluster/kinds/build/android-asan.yml

@@ -19,13 +19,13 @@ task-defaults:
               path: /builds/worker/workspace/obj-build/gradle/maven/
               type: directory
             - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/debug/geckoview-debug-androidTest.apk
               type: file
             - name: public/build/geckoview-test_runner.apk
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/withGeckoBinaries/debug/test_runner-withGeckoBinaries-debug.apk
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/debug/test_runner-debug.apk
               type: file
             - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/debug/geckoview_example-debug.apk
               type: file
             - name: public/build
               path: /builds/worker/artifacts/

taskcluster/kinds/build/android-stuff.yml

@@ -28,7 +28,7 @@ android-geckoview-docs/opt:
             GECKOVIEW_DOCS_UPLOAD_SECRET: "project/releng/gecko/build/level-{level}/geckoview-docs-upload"
         artifacts:
             - name: public/android/geckoview-docs/geckoview-javadoc.jar
-              path: /builds/worker/workspace/obj-build/mobile/android/geckoview/docs/javadoc/withGeckoBinaries-debug/geckoview-javadoc.jar
+              path: /builds/worker/workspace/obj-build/mobile/android/geckoview/docs/javadoc/debug/geckoview-javadoc.jar
               type: file
         max-run-time: 7200
     run:

taskcluster/kinds/build/android.yml

@@ -22,19 +22,19 @@ task-defaults:
               path: /builds/worker/workspace/obj-build/gradle/target.maven.tar.xz
               type: file
             - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/debug/geckoview-debug-androidTest.apk
               type: file
             - name: public/build/geckoview-test_runner.apk
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/withGeckoBinaries/debug/test_runner-withGeckoBinaries-debug.apk
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/debug/test_runner-debug.apk
               type: file
             - name: public/build/geckoview-test_runner.aab
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/withGeckoBinariesDebug/test_runner-withGeckoBinaries-debug.aab
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/debug/test_runner-debug.aab
               type: file
             - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/debug/geckoview_example-debug.apk
               type: file
             - name: public/build/geckoview_example.aab
-              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/withGeckoBinariesDebug/geckoview_example-withGeckoBinaries-debug.aab
+              path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/debug/geckoview_example-debug.aab
               type: file
             - name: public/build
               path: /builds/worker/artifacts/

taskcluster/kinds/instrumented-build/kind.yml

@@ -228,19 +228,19 @@ tasks:
                   path: /builds/worker/artifacts/
                   type: directory
                 - name: public/build/geckoview-androidTest.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/debug/geckoview-debug-androidTest.apk
                   type: file
                 - name: public/build/geckoview-test_runner.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/withGeckoBinaries/debug/test_runner-withGeckoBinaries-debug.apk
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/debug/test_runner-debug.apk
                   type: file
                 - name: public/build/geckoview-test_runner.aab
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/withGeckoBinariesDebug/test_runner-withGeckoBinaries-debug.aab
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/debug/test_runner-debug.aab
                   type: file
                 - name: public/build/geckoview_example.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/debug/geckoview_example-debug.apk
                   type: file
                 - name: public/build/geckoview_example.aab
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/withGeckoBinariesDebug/geckoview_example-withGeckoBinaries-debug.aab
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/debug/geckoview_example-debug.aab
                   type: file
         run:
             config:
@@ -283,19 +283,19 @@ tasks:
                   path: /builds/worker/artifacts/
                   type: directory
                 - name: public/build/geckoview-androidTest.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/debug/geckoview-debug-androidTest.apk
                   type: file
                 - name: public/build/geckoview-test_runner.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/withGeckoBinaries/debug/test_runner-withGeckoBinaries-debug.apk
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/debug/test_runner-debug.apk
                   type: file
                 - name: public/build/geckoview-test_runner.aab
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/withGeckoBinariesDebug/test_runner-withGeckoBinaries-debug.aab
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/debug/test_runner-debug.aab
                   type: file
                 - name: public/build/geckoview_example.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/debug/geckoview_example-debug.apk
                   type: file
                 - name: public/build/geckoview_example.aab
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/withGeckoBinariesDebug/geckoview_example-withGeckoBinaries-debug.aab
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/debug/geckoview_example-debug.aab
                   type: file
         run:
             config:
@@ -338,19 +338,19 @@ tasks:
                   path: /builds/worker/artifacts/
                   type: directory
                 - name: public/build/geckoview-androidTest.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/debug/geckoview-debug-androidTest.apk
                   type: file
                 - name: public/build/geckoview-test_runner.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/withGeckoBinaries/debug/test_runner-withGeckoBinaries-debug.apk
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/debug/test_runner-debug.apk
                   type: file
                 - name: public/build/geckoview-test_runner.aab
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/withGeckoBinariesDebug/test_runner-withGeckoBinaries-debug.aab
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/debug/test_runner-debug.aab
                   type: file
                 - name: public/build/geckoview_example.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/debug/geckoview_example-debug.apk
                   type: file
                 - name: public/build/geckoview_example.aab
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/withGeckoBinariesDebug/geckoview_example-withGeckoBinaries-debug.aab
+                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/debug/geckoview_example-debug.aab
                   type: file
         run:
             config:

taskcluster/kinds/source-test/mozlint-android.yml

@@ -34,31 +34,28 @@ lints:
               name: public/code-review/mozlint.json
               path: /builds/worker/mozlint.json
             - name: public/android/geckoview/api.txt
-              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/intermediates/javac/withGeckoBinariesDebug/api.txt
+              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/intermediates/javac/debug/api.txt
               type: file
             - name: public/android/geckoview/api.txt.map
-              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/intermediates/javac/withGeckoBinariesDebug/api.txt.map
+              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/intermediates/javac/debug/api.txt.map
               type: file
             - name: public/android/geckoview/apilint-result.json
-              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/intermediates/javac/withGeckoBinariesDebug/apilint-result.json
+              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/intermediates/javac/debug/apilint-result.json
               type: file
             - name: public/android/geckoview/javadoc-results.json
-              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/reports/javadoc-results-withGeckoBinariesDebug.json
+              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/reports/javadoc-results-debug.json
               type: file
             - name: public/geckoview/unittest
               path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/reports/tests
               type: directory
-            - name: public/android/lint/lint-results-officialWithoutGeckoBinariesDebug.html
-              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/reports/lint-results-withGeckoBinariesDebug.html
-              type: file
-            - name: public/android/lint/lint-results-withGeckoBinariesDebug.xml
-              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/reports/lint-results-withGeckoBinariesDebug.xml
+            - name: public/android/lint/lint-results-debug.xml
+              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/reports/lint-results-debug.xml
               type: file
             - name: public/android/checkstyle/checkstyle.html
-              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/reports/checkstyle/withGeckoBinariesDebug.html
+              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/reports/checkstyle/debug.html
               type: file
             - name: public/android/checkstyle/checkstyle.xml
-              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/reports/checkstyle/withGeckoBinariesDebug.xml
+              path: /builds/worker/checkouts/gecko/obj-firefox/gradle/build/mobile/android/geckoview/reports/checkstyle/debug.xml
               type: file
     run:
         using: run-task

testing/xpcshell/mach_commands.py

@@ -168,7 +168,7 @@ class AndroidXPCShellRunner(MozbuildObject):
             for root, _, paths in os.walk(os.path.join(kwargs["objdir"], "gradle")):
                 for file_name in paths:
                     if file_name.endswith(".apk") and file_name.startswith(
-                        "test_runner-withGeckoBinaries"
+                        "test_runner"
                     ):
                         kwargs["localAPK"] = os.path.join(root, file_name)
                         print("using APK: %s" % kwargs["localAPK"])

tools/lint/android/lints.py

@@ -410,9 +410,6 @@ def lint(config, **lintargs):
         extra_args=lintargs.get("extra_args") or [],
     )
 
-    # It's surprising that this is the App variant name, but this is "withoutGeckoBinariesDebug"
-    # right now and the GeckoView variant name is "withGeckoBinariesDebug".  This will be addressed
-    # as we unify variants.
     path = os.path.join(
         lintargs["topobjdir"],
         "gradle/build/mobile/android/geckoview/reports",