diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /mobile/android/geckoview/build.gradle | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 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.gradle | 16 |
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() |