Skip to content

Commit 79e5592

Browse files
committed
[DRAFT] build: ...
1 parent 3646b26 commit 79e5592

2 files changed

Lines changed: 5 additions & 19 deletions

File tree

scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ gomobile init
2727
gomobile bind -v \
2828
-androidapi 21 \
2929
-trimpath \
30-
-ldflags='-s -w' \
30+
-ldflags='-s -w -buildid=' \
3131
-tags='with_conntrack,with_gvisor,with_quic,with_wireguard,with_utls,with_clash_api,with_ech' .
3232

3333
rm -v "$GOPATH/bin/gomobile" "$GOPATH/bin/gobind" "$SCRIPT_DIR/../libcore-sources.jar"

scripts/env.sh

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,13 @@
22

33
set -e
44

5-
if [ -z "$ANDROID_HOME" ]; then
6-
if [ -d "$HOME/Android/Sdk" ]; then
7-
export ANDROID_HOME="$HOME/Android/Sdk"
8-
elif [ -d "$HOME/.local/lib/android/sdk" ]; then
9-
export ANDROID_HOME="$HOME/.local/lib/android/sdk"
10-
elif [ -d "$HOME/Library/Android/sdk" ]; then
11-
export ANDROID_HOME="$HOME/Library/Android/sdk"
12-
fi
13-
fi
14-
15-
export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/25.2.9519653"
5+
export ANDROID_NDK_HOME=/home/vm/Android/Sdk/ndk/25.2.9519653
6+
export ANDROID_NDK_ROOT=/home/vm/Android/Sdk/ndk/25.2.9519653
167
export NDK="$ANDROID_NDK_HOME"
178

18-
if [[ ! -f "$ANDROID_NDK_HOME/source.properties" ]]; then
19-
echo "ERROR: Android NDK not found!"
20-
exit 1
21-
fi
9+
DEPS="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin"
2210

23-
DEPS=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin
24-
25-
export ANDROID_ARM_CC=$DEPS/armv7a-linux-androideabi21-clang
11+
export ANDROID_ARM_CC="$DEPS/armv7a-linux-androideabi21-clang"
2612
export ANDROID_ARM_CXX=$DEPS/armv7a-linux-androideabi21-clang++
2713
export ANDROID_ARM_CC_21=$DEPS/armv7a-linux-androideabi21-clang
2814
export ANDROID_ARM_CXX_21=$DEPS/armv7a-linux-androideabi21-clang++

0 commit comments

Comments
 (0)