android-dependencies.patch 1.5 KB

12345678910111213141516171819202122232425262728293031
  1. diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
  2. index c8380042d8a9..990fabe05a60 100644
  3. --- a/mobile/android/app/build.gradle
  4. +++ b/mobile/android/app/build.gradle
  5. @@ -225,8 +225,10 @@ dependencies {
  6. implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
  7. implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
  8. implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
  9. - implementation files('orbotservice-release.aar')
  10. + implementation files('android-release.aar')
  11. + implementation files('universal-0.0.3.jar')
  12. implementation files('jsocksAndroid-release.aar')
  13. + implementation files('service-release.aar')
  14. if (mozconfig.substs.MOZ_NATIVE_DEVICES) {
  15. implementation "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
  16. @@ -265,9 +267,10 @@ dependencies {
  17. // Including the Robotium JAR directly can cause issues with dexing.
  18. androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4'
  19. - // Orbotservice
  20. - implementation 'org.torproject:tor-android-binary:0.3.4.9'
  21. - implementation 'com.jrummyapps:android-shell:1.0.1'
  22. + //tor-android-service
  23. + implementation 'net.freehaven.tor.control:jtorctl:0.2'
  24. + implementation 'org.slf4j:slf4j-api:1.7.25'
  25. + implementation 'org.slf4j:slf4j-android:1.7.25'
  26. }
  27. // TODO: (bug 1261486): This impl is not robust -