From 47c813ba927822b0e2fe67a552a6c63b4c45bf56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <sekai@neko.services>
Date: Thu, 27 May 2021 07:42:42 +0800
Subject: [PATCH] Fix F-Droid build

---
 bin/fdroid/build.sh    |  3 +++
 bin/fdroid/prebuild.sh | 10 ++++++++++
 gradle.properties      |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bin/fdroid/build.sh b/bin/fdroid/build.sh
index ac3679672..0dbced11d 100755
--- 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
\ No newline at end of file
diff --git a/bin/fdroid/prebuild.sh b/bin/fdroid/prebuild.sh
index 9c46902fe..0ab564e23 100755
--- 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
index 4e238ea2a..9b871000a 100644
--- 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