Merge branch 'tor-snowflake' into 'master'

tor-over-snowflake

Closes #9045

See merge request leap/bitmask_android!138

1 files changed, 19 insertions, 7 deletions

diff --git a/app/build.gradle b/app/build.gradle
index f1331e12..9e1d4d7b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,6 +5,7 @@ apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 30
+  ndkVersion "21.4.7075529"
 
   compileOptions {
     targetCompatibility 1.8
@@ -230,6 +231,9 @@ android {
       applicationIdSuffix ".beta"
       appSuffix = " Beta"
       buildConfigField "Boolean", "DEBUG_MODE", "true"
+
+      // tor-android doesn't know this build-type, fallback to release in that case
+      matchingFallbacks = ['release']
     }
     debug {
       testCoverageEnabled = true
@@ -250,6 +254,7 @@ android {
                         ]
       jniLibs.srcDirs = ['../ics-openvpn/main/build/intermediates/cmake/skeletonRelease/obj/']
       jni.srcDirs = [] //disable automatic ndk-build
+
     }
     debug {
       assets.srcDirs = ['src/debug/assets',
@@ -391,12 +396,18 @@ dependencies {
   implementation 'androidx.cardview:cardview:1.0.0'
   implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
   implementation 'de.hdodenhof:circleimageview:3.1.0'
-  fatwebImplementation project(path: ':bitmask-web-core')
-  fatImplementation project(path: ':bitmask-core')
-  x86Implementation project(path: ':bitmask-core')
-  x86_64Implementation project(path: ':bitmask-core')
-  armv7Implementation project(path: ':bitmask-core')
-  arm64Implementation project(path: ':bitmask-core')
+
+
+  //implementation 'info.guardianproject:tor-android:0.4.5.7'
+  //implementation 'info.guardianproject:jtorctl:0.4.5.7'
+  implementation project(path: ':tor-android:tor-android-binary')
+
+  fatwebImplementation project(path: ':lib-bitmask-core-web')
+  fatImplementation project(path: ':lib-bitmask-core')
+  x86Implementation project(path: ':lib-bitmask-core-x86')
+  x86_64Implementation project(path: ':lib-bitmask-core-x86_64')
+  armv7Implementation project(path: ':lib-bitmask-core-armv7')
+  arm64Implementation project(path: ':lib-bitmask-core-arm64')
 }
 
 android.applicationVariants.all { variant ->
@@ -438,7 +449,8 @@ android.applicationVariants.all { variant ->
                                                                                   'urls/',
                                                                                   '*.url',
                                                                                   '*.json',
-                                                                                  '*.pem'])
+                                                                                  '*.pem',
+                                                                                  'fronts'])
       delete(filesToDelete)
     }
   }