summaryrefslogtreecommitdiffstats
path: root/mobile/android/geckoview/build.gradle
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:35:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:35:29 +0000
commit59203c63bb777a3bacec32fb8830fba33540e809 (patch)
tree58298e711c0ff0575818c30485b44a2f21bf28a0 /mobile/android/geckoview/build.gradle
parentAdding upstream version 126.0.1. (diff)
downloadfirefox-59203c63bb777a3bacec32fb8830fba33540e809.tar.xz
firefox-59203c63bb777a3bacec32fb8830fba33540e809.zip
Adding upstream version 127.0.upstream/127.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mobile/android/geckoview/build.gradle')
-rw-r--r--mobile/android/geckoview/build.gradle16
1 files changed, 2 insertions, 14 deletions
diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle
index 040cd2fea8..8a8ba698ec 100644
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@@ -229,6 +229,8 @@ configurations {
dependencies {
implementation ComponentsDependencies.androidx_annotation
+ implementation ComponentsDependencies.androidx_collection
+ implementation ComponentsDependencies.androidx_core
implementation "com.google.android.gms:play-services-fido:20.0.1"
implementation "org.yaml:snakeyaml:2.2"
@@ -384,20 +386,6 @@ android.libraryVariants.all { variant ->
}
}
-android.libraryVariants.all { variant ->
- // At this point, the Android-Gradle plugin has created all the Android
- // tasks and configurations. This is the time for us to declare additional
- // Glean files to package into AAR files. This packs `metrics.yaml` in the
- // root of the AAR, sibling to `AndroidManifest.xml` and `classes.jar`. By
- // default, consumers of the AAR will ignore this file, but consumers that
- // look for it can find it (provided GeckoView is a `module()` dependency
- // and not a `project()` dependency.) Under the hood this uses that the
- // task provided by `packageLibraryProvider` task is a Maven `Zip` task,
- // and we can simply extend its inputs. See
- // https://android.googlesource.com/platform/tools/base/+/0cbe8846f7d02c0bb6f07156b9f4fde16d96d329/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/BundleAar.kt#94.
- variant.packageLibraryProvider.get().from("${topsrcdir}/toolkit/components/telemetry/geckoview/streaming/metrics.yaml")
-}
-
apply plugin: 'maven-publish'
version = getVersionNumber()