Commit 86b24fa4 authored by Beatriz Rizental's avatar Beatriz Rizental
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 b97265e0

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ media/libvpx/config/**/config.log 
mobile/android/.experimenter.json



# Tor libraries for local builds

mobile/android/fenix/app/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
@@ -4,6 +4,8 @@ import org.tomlj.TomlTable 


buildscript {

    repositories {

        mavenLocal()



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

            maven {

                url repository
@@ -136,6 +138,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/browser/storage-sync/src/main/java/mozilla/components/browser/storage/sync/Types.kt

+14 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ internal fun mozilla.appservices.places.uniffi.VisitType.into() = when (this) { 
    mozilla.appservices.places.uniffi.VisitType.REDIRECT_TEMPORARY -> VisitType.REDIRECT_TEMPORARY

    mozilla.appservices.places.uniffi.VisitType.DOWNLOAD -> VisitType.DOWNLOAD

    mozilla.appservices.places.uniffi.VisitType.FRAMED_LINK -> VisitType.FRAMED_LINK

    mozilla.appservices.places.uniffi.VisitType.__NOOP -> VisitType.LINK

}



internal fun mozilla.appservices.places.uniffi.HistoryVisitInfo.into(): VisitInfo {
@@ -129,6 +130,18 @@ internal fun BookmarkItem.asBookmarkNode(): BookmarkNode { 
                null,

            )

        }

        is BookmarkItem.__NOOP -> {

            BookmarkNode(

                BookmarkNodeType.ITEM,

                "",

                "",

                null,

                null,

                null,

                0L,

                null,

            )

        }

    }

}
@@ -152,6 +165,7 @@ internal fun mozilla.appservices.places.uniffi.DocumentType.into(): DocumentType 
    return when (this) {

        mozilla.appservices.places.uniffi.DocumentType.REGULAR -> DocumentType.Regular

        mozilla.appservices.places.uniffi.DocumentType.MEDIA -> DocumentType.Media

        mozilla.appservices.places.uniffi.DocumentType.__NOOP -> DocumentType.Regular

    }

}

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"

        }