Dan Ballard pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 2d0e34d5 by clairehurst at 2026-03-24T14:33:48-06:00 fixup! [android] Modify build system - - - - - 6f660c9d by clairehurst at 2026-03-24T14:33:48-06:00 fixup! [android] Disable features and functionality - - - - - 4 changed files: - mobile/android/android-components/components/feature/accounts/build.gradle - mobile/android/android-components/components/feature/search/build.gradle - mobile/android/fenix/app/build.gradle - mobile/android/focus-android/app/build.gradle Changes: ===================================== mobile/android/android-components/components/feature/accounts/build.gradle ===================================== @@ -13,7 +13,7 @@ apply plugin: 'kotlin-android' android { androidResources { - ignoreAssetsPattern '!<dir>extensions' + ignoreAssetsPattern = '!<dir>extensions' } namespace = 'mozilla.components.feature.accounts' ===================================== mobile/android/android-components/components/feature/search/build.gradle ===================================== @@ -13,7 +13,7 @@ apply plugin: 'kotlin-android' android { androidResources { - ignoreAssetsPattern '!<dir>extensions:!search_telemetry_v2.json:!amazon*:!azerdict*:!baidu*:!bing*:!ceneje*:!coccoc*:!daum*:!ebay*:!ecosia*:!faclair*:!google*:!gulesider*:!leo*:!mapy*:!mercadolibre*:!odpiralni*:!pazaruvaj*:!prisjakt*:!qwant*:!rakuten*:!salidzinilv*:!seznam*:!vatera*:!wikipedia-*:!wiktionary*:!yahoo*:!yandex*' + ignoreAssetsPattern = '!<dir>extensions:!search_telemetry_v2.json:!amazon*:!azerdict*:!baidu*:!bing*:!ceneje*:!coccoc*:!daum*:!ebay*:!ecosia*:!faclair*:!google*:!gulesider*:!leo*:!mapy*:!mercadolibre*:!odpiralni*:!pazaruvaj*:!prisjakt*:!qwant*:!rakuten*:!salidzinilv*:!seznam*:!vatera*:!wikipedia-*:!wiktionary*:!yahoo*:!yandex*' } sourceSets { ===================================== mobile/android/fenix/app/build.gradle ===================================== @@ -56,17 +56,7 @@ def getBuildId() { return file("${gradle.mozconfig.topobjdir}/buildid.h").getText('utf-8').split()[2] } -def obtainTestBuildType() { - def result = "debug"; - if (project.hasProperty("testBuildType")) { - result = project.getProperties().get("testBuildType") - } - result -} - android { - testBuildType obtainTestBuildType() - project.maybeConfigForJetpackBenchmark(it) if (project.hasProperty("testBuildType")) { // Allowing to configure the test build type via command line flag (./gradlew -PtestBuildType=beta ..) @@ -325,10 +315,7 @@ android.applicationVariants.configureEach { variant -> System.setProperty("nimbusFml", gradle.mozconfig.substs.NIMBUS_FML) } - def disableTor = false - if (project.hasProperty("disableTor")) { - disableTor = project.getProperty("disableTor") - } + def disableTor = providers.gradleProperty("disableTor").getOrElse(false) project.logger.debug("----------------------------------------------") project.logger.debug("Variant name: " + variant.name) @@ -336,7 +323,7 @@ android.applicationVariants.configureEach { variant -> project.logger.debug("Build type: " + variant.buildType.name) project.logger.debug("Flavor: " + variant.flavorName) project.logger.debug("Telemetry enabled: " + !isDebugOrDCD) - project.logger.debug("nimbusFml: " + System.getProperty("nimbusFml")) + project.logger.debug("nimbusFml: " + providers.gradleProperty("nimbusFml").getOrNull()) project.logger.debug("Tor is disabled: " + disableTor) buildConfigField "boolean", "DISABLE_TOR", "$disableTor" ===================================== mobile/android/focus-android/app/build.gradle ===================================== @@ -286,7 +286,6 @@ dependencies { implementation project(':components:feature-webcompat-reporter') implementation project(':components:lib-auth') implementation project(':components:lib-crash') - implementation project(':components:lib-crash-sentry') implementation project(':components:lib-publicsuffixlist') implementation project(':components:lib-state') implementation project(":components:service-glean") @@ -337,7 +336,6 @@ dependencies { implementation libs.mozilla.glean implementation libs.play.review implementation libs.play.review.ktx - implementation libs.sentry debugImplementation libs.leakcanary View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cf77da3... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cf77da3... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help