Commit aacccbd7 authored by Sebastian Kaspari's avatar Sebastian Kaspari
Browse files

Closes #3738: Depend on "fat" GeckoView build from browser-engine-gecko-beta.

parent 48a1be86
......@@ -92,12 +92,12 @@ def create_module_tasks(module):
"assembleOnly/Test": (
["ServoArm", "ServoX86", "SystemUniversal"],
[
"GeckoBetaAarch64", "GeckoBetaArm", "GeckoBetaX86",
"GeckoBetaUniversal",
"GeckoNightlyUniversal",
"GeckoReleaseAarch64", "GeckoReleaseArm", "GeckoReleaseX86"
]
),
"lintTask": "lintGeckoBetaArmDebug"
"lintTask": "lintGeckoNightlyUniversal"
},
":support-test": {
"lintTask": "lint"
......
......@@ -23,9 +23,7 @@ internal object GeckoVersions {
object Gecko {
const val geckoview_nightly = "org.mozilla.geckoview:geckoview-nightly:${GeckoVersions.nightly_version}"
const val geckoview_beta_arm = "org.mozilla.geckoview:geckoview-beta-armeabi-v7a:${GeckoVersions.beta_version}"
const val geckoview_beta_x86 = "org.mozilla.geckoview:geckoview-beta-x86:${GeckoVersions.beta_version}"
const val geckoview_beta_aarch64 = "org.mozilla.geckoview:geckoview-beta-arm64-v8a:${GeckoVersions.beta_version}"
const val geckoview_beta = "org.mozilla.geckoview:geckoview-beta:${GeckoVersions.beta_version}"
const val geckoview_release_arm = "org.mozilla.geckoview:geckoview-armeabi-v7a:${GeckoVersions.release_version}"
const val geckoview_release_x86 = "org.mozilla.geckoview:geckoview-x86:${GeckoVersions.release_version}"
......
......@@ -35,10 +35,7 @@ dependencies {
implementation Dependencies.kotlin_stdlib
implementation Dependencies.kotlin_coroutines
// We only compile against the ARM artifact. External module will decide which module to provide by build configuration.
// As the Kotlin/Java API is the same for all ABIs it is not important which one we import here.
compileOnly Gecko.geckoview_beta_arm
testImplementation Gecko.geckoview_beta_arm
api Gecko.geckoview_beta
testImplementation Dependencies.androidx_test_core
testImplementation Dependencies.androidx_test_junit
......@@ -52,7 +49,6 @@ dependencies {
androidTestImplementation Dependencies.androidx_test_core
androidTestImplementation Dependencies.androidx_test_runner
androidTestImplementation Dependencies.androidx_test_rules
androidTestImplementation Gecko.geckoview_beta_arm
androidTestImplementation project(':tooling-fetch-tests')
}
......
......@@ -51,7 +51,7 @@ dependencies {
androidTestImplementation Dependencies.androidx_test_core
androidTestImplementation Dependencies.androidx_test_runner
androidTestImplementation Dependencies.androidx_test_rules
androidTestImplementation Gecko.geckoview_beta_arm
androidTestImplementation Gecko.geckoview_release_arm
androidTestImplementation project(':tooling-fetch-tests')
}
......
......@@ -18,6 +18,9 @@ permalink: /changelog/
* `browser-engine-gecko-beta`: GeckoView 69.0
* `browser-engine-gecko-nightly`: GeckoView 70.0
* **browser-engine-gecko-beta**
* Like with the nightly flavor previously (0.55.0) this component now has a hard dependency on the new [universal GeckoView build](https://bugzilla.mozilla.org/show_bug.cgi?id=1508976) that is no longer architecture specific (ARM, x86, ..). With that apps no longer need to specify the GeckoView dependency themselves and synchronize the used version with Android Components. Additionally apps can now make use of [APK splits](https://developer.android.com/studio/build/configure-apk-splits) or [Android App Bundles (AAB)](https://developer.android.com/guide/app-bundle).
* **feature-media**
* Added `MediaNotificationFeature` - a feature implementation to show an ongoing notification (keeping the app process alive) while web content is playing media.
......
......@@ -77,8 +77,8 @@ android {
setIgnore(true)
}
// Only allow "universal" flavors of "system" and "geckoviewNightly" engines
if (flavors.contains("universal") && !(flavors.contains("system") || flavors.contains("geckonightly"))) {
// Only allow "universal" flavors of "system", "geckoviewNightly" and "geckoBeta" engines
if (flavors.contains("universal") && !(flavors.contains("system") || flavors.contains("geckonightly") || flavors.contains("geckobeta"))) {
setIgnore(true)
}
......@@ -87,6 +87,11 @@ android {
setIgnore(true)
}
// Ignore all non-universal GeckoView Beta builds
if (!flavors.contains("universal") && flavors.contains("geckobeta")) {
setIgnore(true)
}
if (flavors.contains("servo") && !flavors.contains("arm") && !flavors.contains("x86")) {
setIgnore(true)
}
......@@ -94,10 +99,6 @@ android {
}
configurations {
geckoBetaArmImplementation {}
geckoBetaX86Implementation {}
geckoBetaAarch64Implementation {}
geckoReleaseArmImplementation {}
geckoReleaseX86Implementation {}
geckoReleaseAarch64Implementation {}
......@@ -155,12 +156,8 @@ dependencies {
servoArmImplementation Dependencies.mozilla_servo_arm
geckoNightlyImplementation project(':browser-engine-gecko-nightly')
geckoNightlyImplementation Gecko.geckoview_nightly
geckoBetaImplementation project(':browser-engine-gecko-beta')
geckoBetaArmImplementation Gecko.geckoview_beta_arm
geckoBetaX86Implementation Gecko.geckoview_beta_x86
geckoBetaAarch64Implementation Gecko.geckoview_beta_aarch64
geckoReleaseImplementation project(':browser-engine-gecko')
geckoReleaseArmImplementation Gecko.geckoview_release_arm
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment