Skip to content

Commit c9ef3ef

Browse files
committed
Remove go from the repo
Fix #1935.
1 parent fed1b50 commit c9ef3ef

File tree

6 files changed

+7
-26
lines changed

6 files changed

+7
-26
lines changed

.circleci/Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
FROM circleci/android:api-28-alpha
22

3-
RUN sudo apt-get install -y golang
4-
ENV GOROOT_BOOTSTRAP /usr/lib/go
3+
RUN \
4+
wget -O /tmp/go.tgz "https://golang.org/dl/go1.11.linux-amd64.tar.gz"; \
5+
sudo tar -C /usr/local -xzf /tmp/go.tgz; \
6+
rm /tmp/go.tgz
7+
ENV PATH /usr/local/go/bin:$PATH

.circleci/config.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@ jobs:
55
docker:
66
- image: shadowsocks/shadowsocks-android:circleci
77
environment:
8-
JVM_OPTS: -Xmx5g
9-
resource_class: medium+
8+
JVM_OPTS: -Xmx3.5g
109
steps:
1110
- checkout
1211
- run: git submodule update --init --recursive
1312
- restore_cache:
1413
key: jars-{{ checksum "build.gradle" }}
15-
- restore_cache:
16-
key: go-full-{{ checksum "~/code/.git/modules/core/src/overture/go/HEAD" }}
1714
- run:
1815
name: Run Build and Tests
1916
command: ./gradlew assembleDebug check
@@ -22,10 +19,6 @@ jobs:
2219
- ~/.gradle
2320
- ~/.android/build-cache
2421
key: jars-{{ checksum "build.gradle" }}
25-
- save_cache:
26-
paths:
27-
- ~/code/core/src/overture/go
28-
key: go-full-{{ checksum "~/code/.git/modules/core/src/overture/go/HEAD" }}
2922
- store_artifacts:
3023
path: mobile/build/outputs/apk
3124
destination: apk/mobile

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
[submodule "core/src/main/jni/libev"]
3131
path = core/src/main/jni/libev
3232
url = https://github.com/shadowsocks/libev.git
33-
[submodule "core/src/overture/go"]
34-
path = core/src/overture/go
35-
url = https://github.com/golang/go.git
3633
[submodule "core/src/overture/src/github.com/shadowsocks/overture"]
3734
path = core/src/overture/src/github.com/shadowsocks/overture
3835
url = https://github.com/shadowsocks/overture.git

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Kotlin.
1313
### PREREQUISITES
1414

1515
* JDK 1.8
16-
* Go 1.4+
16+
* Go 1.11+
1717
* Android SDK
1818
- Build Tools 27+
1919
- Android NDK r16+
@@ -26,7 +26,6 @@ but probably painful. Further contributions regarding building on Windows are al
2626

2727
* Set environment variable `ANDROID_HOME` to `/path/to/android-sdk`
2828
* (optional) Set environment variable `ANDROID_NDK_HOME` to `/path/to/android-ndk` (default: `$ANDROID_HOME/ndk-bundle`)
29-
* Set environment variable `GOROOT_BOOTSTRAP` to `/path/to/go`
3029
* Clone the repo using `git clone --recurse-submodules <repo>` or update submodules using `git submodule update --init --recursive`
3130
* Build it using Android Studio or gradle script
3231

core/src/overture/go

-1
This file was deleted.

core/src/overture/make.bash

-10
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,7 @@ if [ ! -f "$ANDROID_X86_CC" ]; then
4444
--api $MIN_API --install-dir $ANDROID_X86_TOOLCHAIN
4545
fi
4646

47-
if [ ! -f "$DIR/go/bin/go" ]; then
48-
echo "Build the custom go"
49-
50-
pushd $DIR/go/src
51-
try ./make.bash
52-
popd
53-
fi
54-
55-
export GOROOT=$DIR/go
5647
export GOPATH=$DIR
57-
export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
5848

5949
if [ ! -f "$TARGET/armeabi-v7a/liboverture.so" ] || [ ! -f "$TARGET/arm64-v8a/liboverture.so" ] ||
6050
[ ! -f "$TARGET/x86/liboverture.so" ]; then

0 commit comments

Comments
 (0)