bepass-org · markpash · Aug 7, 2024 · Aug 5, 2024 · Aug 5, 2024 · Aug 5, 2024
diff --git a/README.md b/README.md
@@ -17,34 +17,19 @@ It's leveraging `bepass-sdk` and a custom Go implementation of WireGuard, it's d
 ## Quick Start
 
 1. **Download**: Grab the APK from our [Releases](https://github.com/bepass-org/oblivion/releases) page or [Google play store](https://play.google.com/store/apps/details?id=org.bepass.oblivion) and install it.
-<a href="https://play.google.com/store/apps/details?id=org.bepass.oblivion">
-<img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" width="165" height="64" />
-</a>
+   <a href="https://play.google.com/store/apps/details?id=org.bepass.oblivion">
+   <img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" width="165" height="64" />
+   </a>
 
 2. **Connect**: Launch Oblivion and hit the switch button.
 
 ## Building the Project
 
 ### Prerequisites
-- Java 17
-- Gradle 8
-- Android Gradle Plugin (AGP) 8.1.2
 - NDK r26b (26.1.10909125)
 - Go 1.22
 
-Follow the steps below to build the Oblivion:
-
-### Building Go libraries
-Open the Terminal tab at the bottom of Android Studio.
-
-Navigate to the libs directory:
-
-```bash
-cd app/libs
-go run golang.org/x/mobile/cmd/gomobile init
-go run golang.org/x/mobile/cmd/gomobile bind -ldflags="-w -s" -target=android -androidapi=21 -o=tun2socks.aar .
-```
-### Generate Signed Bundle/APK:
+### Follow the steps below to build the Oblivion:
 - In Android Studio, navigate to "Build" in the menu bar.
 - Select "Generate Signed Bundle/APK..."
 - Choose "APK" and proceed.

diff --git a/app/build.gradle b/app/build.gradle
@@ -65,3 +65,21 @@ dependencies {
     implementation 'com.github.erfansn:locale-config-x:1.0.1'
     implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'])
 }
+
+tasks.register("preBuildTun2SocksAar", Exec) {
+    workingDir "../tun2socks"
+    commandLine "go", "run", "golang.org/x/mobile/cmd/gomobile", "init"
+}
+tasks.register("buildTun2SocksAar", Exec) {
+    doFirst {
+        File myDir = new File("$projectDir/libs")
+        if (!myDir.exists()) {
+            myDir.mkdirs()
+        }
+    }
+
+    workingDir "../tun2socks"
+    commandLine "go", "run", "golang.org/x/mobile/cmd/gomobile", "bind", "-ldflags=-w -s", "-target=android", "-androidapi=$android.defaultConfig.minSdk", "-o=$projectDir/libs/tun2socks.aar", "."
+    dependsOn(preBuildTun2SocksAar)
+}
+preBuild.dependsOn(buildTun2SocksAar)
diff --git a/app/libs/README.md → tun2socks/README.md b/app/libs/README.md → tun2socks/README.md
diff --git a/app/libs/go.mod → tun2socks/go.mod b/app/libs/go.mod → tun2socks/go.mod
diff --git a/app/libs/go.sum → tun2socks/go.sum b/app/libs/go.sum → tun2socks/go.sum
diff --git a/app/libs/lwip/lwip.go → tun2socks/lwip/lwip.go b/app/libs/lwip/lwip.go → tun2socks/lwip/lwip.go
diff --git a/app/libs/tools.go → tun2socks/tools.go b/app/libs/tools.go → tun2socks/tools.go
diff --git a/app/libs/tun2socks.go → tun2socks/tun2socks.go b/app/libs/tun2socks.go → tun2socks/tun2socks.go