Fix F-Droid build

NextAlone · May 27, 2021 · 47c813b · 47c813b
1 parent c20e334
commit 47c813b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/bin/fdroid/build.sh b/bin/fdroid/build.sh
@@ -6,3 +6,6 @@ source "bin/init/env.sh"
 # Native dependencies
 bin/init/libs/ffmpeg.sh
 bin/init/libs/boringssl.sh
+
+# Build v2ray-core
+bin/libs/v2ray/build.sh
diff --git a/bin/fdroid/prebuild.sh b/bin/fdroid/prebuild.sh
@@ -5,6 +5,16 @@ source "bin/init/env.sh"
 echo "sdk.dir=$ANDROID_HOME" >>local.properties
 echo "ndk.dir=$ANDROID_NDK_HOME" >>local.properties
 
+# Install Golang
+curl -o golang.tar.gz https://storage.googleapis.com/golang/go1.16.linux-amd64.tar.gz
+mkdir "$HOME/.go"
+tar -C "$HOME/.go" --strip-components=1 -xzf golang.tar.gz
+rm golang.tar.gz
+export PATH="$PATH:$HOME/.go/bin"
+go version || exit 1
+
+bin/libs/v2ray/init.sh
+
 ## Remove unused non-free dependencies
 pushd TMessagesProj
 

diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@
 RELEASE_KEY_PASSWORD=android
 RELEASE_KEY_ALIAS=androidkey
 RELEASE_STORE_PASSWORD=android
-org.gradle.jvmargs=-XX:MaxPermSize=16384m
+org.gradle.jvmargs=-XX:MaxPermSize=4096m
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureondemand=false