commit a5a146c8f4db2baf87dd663c9340f9a0edd32ea5 Author: bim dsnake@protonmail.com Date: Thu Nov 12 15:43:13 2020 -0500

Made IPtProxy a module, only ship app with one AAR file --- {app/libs => IPtProxy}/IPtProxy.aar | Bin IPtProxy/build.gradle | 2 ++ app/build.gradle | 18 ------------------ orbotservice/build.gradle | 11 +---------- orbotservice/libs/IPtProxy.aar | Bin 29425327 -> 0 bytes settings.gradle | 1 + 6 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/app/libs/IPtProxy.aar b/IPtProxy/IPtProxy.aar similarity index 100% rename from app/libs/IPtProxy.aar rename to IPtProxy/IPtProxy.aar diff --git a/IPtProxy/build.gradle b/IPtProxy/build.gradle new file mode 100644 index 00000000..afc0293e --- /dev/null +++ b/IPtProxy/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('IPtProxy.aar')) \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8c8810ff..f3e4883a 100644 --- 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 index a081735e..447ee60d 100644 --- 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 deleted file mode 100644 index ed76d5fb..00000000 Binary files a/orbotservice/libs/IPtProxy.aar and /dev/null differ diff --git a/settings.gradle b/settings.gradle index 46cf1758..d9af051e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ +include ':IPtProxy' include ':intentintegrator' include ':appcore' include ':orbotservice',':app',':app-mini'