diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:50 +0000 |
| commit | def92d1b8e9d373e2f6f27c366d578d97d8960c6 (patch) | |
| tree | 2ef34b9ad8bb9a9220e05d60352558b15f513894 /mobile/android/geckoview_example | |
| parent | Adding debian version 125.0.3-1. (diff) | |
| download | firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.tar.xz firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mobile/android/geckoview_example')
| -rw-r--r-- | mobile/android/geckoview_example/build.gradle | 14 | ||||
| -rw-r--r-- | mobile/android/geckoview_example/src/main/AndroidManifest.xml | 3 |
2 files changed, 6 insertions, 11 deletions
diff --git a/mobile/android/geckoview_example/build.gradle b/mobile/android/geckoview_example/build.gradle index 1ca7127839..4c8473c047 100644 --- a/mobile/android/geckoview_example/build.gradle +++ b/mobile/android/geckoview_example/build.gradle @@ -16,8 +16,6 @@ android { applicationId "org.mozilla.geckoview_example" versionCode project.ext.versionCode versionName project.ext.versionName - - multiDexEnabled true } compileOptions { @@ -53,13 +51,11 @@ android { } dependencies { - implementation "androidx.annotation:annotation:1.6.0" - implementation "androidx.appcompat:appcompat:1.6.1" - implementation "androidx.preference:preference:1.1.1" + implementation ComponentsDependencies.androidx_annotation + implementation ComponentsDependencies.androidx_appcompat + implementation ComponentsDependencies.androidx_preferences implementation project(path: ':geckoview') - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'com.google.android.material:material:1.9.0' - - implementation 'androidx.multidex:multidex:2.0.1' + implementation ComponentsDependencies.androidx_constraintlayout + implementation ComponentsDependencies.google_material } diff --git a/mobile/android/geckoview_example/src/main/AndroidManifest.xml b/mobile/android/geckoview_example/src/main/AndroidManifest.xml index 1aa1ba4abf..63f3168ba3 100644 --- a/mobile/android/geckoview_example/src/main/AndroidManifest.xml +++ b/mobile/android/geckoview_example/src/main/AndroidManifest.xml @@ -17,8 +17,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:usesCleartextTraffic="true" - android:icon="@drawable/logo" - android:name="androidx.multidex.MultiDexApplication"> + android:icon="@drawable/logo"> <uses-library android:name="android.test.runner" android:required="false"/> |