Made IPtProxy a module, only ship app with one AAR file

guardianproject · Nov 12, 2020 · a5a146c · a5a146c
1 parent 4a39df4
commit a5a146c
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 28 deletions.
diff --git a/app/libs/IPtProxy.aar → IPtProxy/IPtProxy.aar b/app/libs/IPtProxy.aar → IPtProxy/IPtProxy.aar
diff --git a/IPtProxy/build.gradle b/IPtProxy/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('IPtProxy.aar'))
diff --git a/app/build.gradle b/app/build.gradle
@@ -81,16 +81,6 @@ android {
             versionName getVersionName()
             archivesBaseName = "Orbot-$versionName"
         }
-        /**
-        appmax {
-            dimension "free"
-            minSdkVersion 16
-            applicationId 'org.torproject.android.max'
-            targetSdkVersion 28
-            versionCode 161410000
-            versionName getVersionName()
-            archivesBaseName = "orbotMAX-$versionName"
-        }**/
     }
 
     splits {
@@ -113,14 +103,6 @@ android {
             // Specifies that we do not want to also generate a universal APK that includes all ABIs.
             universalApk true
         }
-
-
-    }
-
-    repositories {
-        flatDir {
-            dir 'libs'
-        }
     }
 }
 

diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
@@ -37,14 +37,6 @@ android {
     packagingOptions {
         exclude 'assets/arm/obfs4proxy' //this is redundant
     }
-
-    repositories {
-        flatDir {
-            dir 'libs'
-        }
-    }
-
-
 }
 
 dependencies {
@@ -69,6 +61,5 @@ dependencies {
     implementation 'info.guardianproject:jtorctl:0.4'
 
     /*********** IPtProxy: https://github.com/tladesignz/IPtProxy  **********/
-    implementation(name: 'IPtProxy', ext: 'aar')
-
+    implementation project(path: ':IPtProxy')
 }
diff --git a/orbotservice/libs/IPtProxy.aar b/orbotservice/libs/IPtProxy.aar
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,4 @@
+include ':IPtProxy'
 include ':intentintegrator'
 include ':appcore'
 include ':orbotservice',':app',':app-mini'