Commit 066e0d83 authored by Beatriz Rizental's avatar Beatriz Rizental Committed by Pier Angelo Vendrame
Browse files

TB 42669: [android] Use custom no-op app-services 

Fetch the custom built no-op application services library
from tor-browser-build when building for Android.
parent d6db13d2

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ toolkit/crashreporter/minidump-analyzer/analyzer-test/target/ 
mobile/android/.experimenter.json



# Tor libraries for local builds

mobile/android/fenix/tools/nimbus-fml

mobile/android/fenix/app/tor-expert-bundle.aar

mobile/android/fenix/app/src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi

build.gradle

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ import org.tomlj.TomlTable 


buildscript {

    repositories {

        mavenLocal()



        gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->

            maven {

                url = repository
@@ -129,6 +131,8 @@ allprojects { 
    }



    repositories {

        mavenLocal()



        gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->

            maven {

                url = repository

mobile/android/android-components/components/browser/engine-gecko/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


buildscript {

    repositories {

        mavenLocal()



        gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->

            maven {

                url = repository

mobile/android/android-components/components/feature/fxsuggest/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile 


buildscript {

    repositories {

        mavenLocal()



        maven {

            url = "https://maven.mozilla.org/maven2"

        }

mobile/android/android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/Types.kt

+4 −3
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ internal fun RustDeviceType.into(): DeviceType { 
        RustDeviceType.TABLET -> DeviceType.TABLET

        RustDeviceType.TV -> DeviceType.TV

        RustDeviceType.VR -> DeviceType.VR

        RustDeviceType.UNKNOWN -> DeviceType.UNKNOWN

        else-> DeviceType.UNKNOWN

    }

}
@@ -165,7 +165,7 @@ fun DeviceCapability.into(): RustDeviceCapability { 
fun RustDeviceCapability.into(): DeviceCapability {

    return when (this) {

        RustDeviceCapability.SEND_TAB -> DeviceCapability.SEND_TAB

        RustDeviceCapability.CLOSE_TABS -> DeviceCapability.CLOSE_TABS

        else -> DeviceCapability.CLOSE_TABS

    }

}
@@ -250,7 +250,7 @@ fun AccountEvent.into(): mozilla.components.concept.sync.AccountEvent { 
                deviceId = this.deviceId,

                isLocalDevice = this.isLocalDevice,

            )

        is AccountEvent.Unknown -> mozilla.components.concept.sync.AccountEvent.Unknown

        else -> mozilla.components.concept.sync.AccountEvent.Unknown

    }

}
@@ -258,6 +258,7 @@ fun IncomingDeviceCommand.into(): mozilla.components.concept.sync.DeviceCommandI 
    return when (this) {

        is IncomingDeviceCommand.TabReceived -> this.into()

        is IncomingDeviceCommand.TabsClosed -> this.into()

        is IncomingDeviceCommand.__NOOP -> this.into()

    }

}