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
-
6f660c9d
by clairehurst at 2026-03-24T14:33:48-06:00
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:
| ... | ... | @@ -13,7 +13,7 @@ apply plugin: 'kotlin-android' |
| 13 | 13 | |
| 14 | 14 | android {
|
| 15 | 15 | androidResources {
|
| 16 | - ignoreAssetsPattern '!<dir>extensions'
|
|
| 16 | + ignoreAssetsPattern = '!<dir>extensions'
|
|
| 17 | 17 | }
|
| 18 | 18 | |
| 19 | 19 | namespace = 'mozilla.components.feature.accounts'
|
| ... | ... | @@ -13,7 +13,7 @@ apply plugin: 'kotlin-android' |
| 13 | 13 | |
| 14 | 14 | android {
|
| 15 | 15 | androidResources {
|
| 16 | - 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*'
|
|
| 16 | + 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*'
|
|
| 17 | 17 | }
|
| 18 | 18 | |
| 19 | 19 | sourceSets {
|
| ... | ... | @@ -56,17 +56,7 @@ def getBuildId() { |
| 56 | 56 | return file("${gradle.mozconfig.topobjdir}/buildid.h").getText('utf-8').split()[2]
|
| 57 | 57 | }
|
| 58 | 58 | |
| 59 | -def obtainTestBuildType() {
|
|
| 60 | - def result = "debug";
|
|
| 61 | - if (project.hasProperty("testBuildType")) {
|
|
| 62 | - result = project.getProperties().get("testBuildType")
|
|
| 63 | - }
|
|
| 64 | - result
|
|
| 65 | -}
|
|
| 66 | - |
|
| 67 | 59 | android {
|
| 68 | - testBuildType obtainTestBuildType()
|
|
| 69 | - |
|
| 70 | 60 | project.maybeConfigForJetpackBenchmark(it)
|
| 71 | 61 | if (project.hasProperty("testBuildType")) {
|
| 72 | 62 | // Allowing to configure the test build type via command line flag (./gradlew -PtestBuildType=beta ..)
|
| ... | ... | @@ -325,10 +315,7 @@ android.applicationVariants.configureEach { variant -> |
| 325 | 315 | System.setProperty("nimbusFml", gradle.mozconfig.substs.NIMBUS_FML)
|
| 326 | 316 | }
|
| 327 | 317 | |
| 328 | - def disableTor = false
|
|
| 329 | - if (project.hasProperty("disableTor")) {
|
|
| 330 | - disableTor = project.getProperty("disableTor")
|
|
| 331 | - }
|
|
| 318 | + def disableTor = providers.gradleProperty("disableTor").getOrElse(false)
|
|
| 332 | 319 | |
| 333 | 320 | project.logger.debug("----------------------------------------------")
|
| 334 | 321 | project.logger.debug("Variant name: " + variant.name)
|
| ... | ... | @@ -336,7 +323,7 @@ android.applicationVariants.configureEach { variant -> |
| 336 | 323 | project.logger.debug("Build type: " + variant.buildType.name)
|
| 337 | 324 | project.logger.debug("Flavor: " + variant.flavorName)
|
| 338 | 325 | project.logger.debug("Telemetry enabled: " + !isDebugOrDCD)
|
| 339 | - project.logger.debug("nimbusFml: " + System.getProperty("nimbusFml"))
|
|
| 326 | + project.logger.debug("nimbusFml: " + providers.gradleProperty("nimbusFml").getOrNull())
|
|
| 340 | 327 | project.logger.debug("Tor is disabled: " + disableTor)
|
| 341 | 328 | |
| 342 | 329 | buildConfigField "boolean", "DISABLE_TOR", "$disableTor"
|
| ... | ... | @@ -286,7 +286,6 @@ dependencies { |
| 286 | 286 | implementation project(':components:feature-webcompat-reporter')
|
| 287 | 287 | implementation project(':components:lib-auth')
|
| 288 | 288 | implementation project(':components:lib-crash')
|
| 289 | - implementation project(':components:lib-crash-sentry')
|
|
| 290 | 289 | implementation project(':components:lib-publicsuffixlist')
|
| 291 | 290 | implementation project(':components:lib-state')
|
| 292 | 291 | implementation project(":components:service-glean")
|
| ... | ... | @@ -337,7 +336,6 @@ dependencies { |
| 337 | 336 | implementation libs.mozilla.glean
|
| 338 | 337 | implementation libs.play.review
|
| 339 | 338 | implementation libs.play.review.ktx
|
| 340 | - implementation libs.sentry
|
|
| 341 | 339 | |
| 342 | 340 | debugImplementation libs.leakcanary
|
| 343 | 341 |