mirror of
https://github.com/MGislv/NekoX.git
synced 2024-07-04 11:13:36 +00:00
Update ndk to r21e
This commit is contained in:
parent
462edddba6
commit
1ebdde0cb4
24
.github/workflows/debug.yml
vendored
24
.github/workflows/debug.yml
vendored
|
@ -34,9 +34,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Native Build
|
- name: Native Build
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
|
@ -62,9 +62,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Native Build
|
- name: Native Build
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
|
@ -114,9 +114,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Fix BoringSSL
|
- name: Fix BoringSSL
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
|
@ -147,9 +147,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Install Golang
|
- name: Install Golang
|
||||||
uses: actions/setup-go@v2
|
uses: actions/setup-go@v2
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
|
@ -179,9 +179,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: ./run init action shadowsocks
|
run: ./run init action shadowsocks
|
||||||
|
@ -209,9 +209,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Native Build
|
- name: Native Build
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: ./run libs ssr
|
run: ./run libs ssr
|
||||||
|
|
24
.github/workflows/release.yml
vendored
24
.github/workflows/release.yml
vendored
|
@ -47,9 +47,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Native Build
|
- name: Native Build
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
|
@ -76,9 +76,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Native Build
|
- name: Native Build
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
|
@ -128,9 +128,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Fix BoringSSL
|
- name: Fix BoringSSL
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
|
@ -162,9 +162,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Install Golang
|
- name: Install Golang
|
||||||
uses: actions/setup-go@v2
|
uses: actions/setup-go@v2
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
|
@ -195,9 +195,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: ./run init action shadowsocks
|
run: ./run init action shadowsocks
|
||||||
|
@ -226,9 +226,9 @@ jobs:
|
||||||
- name: Install NDK
|
- name: Install NDK
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
|
||||||
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
echo "sdk.dir=${ANDROID_HOME}" > local.properties
|
||||||
echo "ndk.dir=${ANDROID_HOME}/ndk/21.3.6528147" >> local.properties
|
echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
|
||||||
- name: Native Build
|
- name: Native Build
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
run: ./run libs ssr
|
run: ./run libs ssr
|
||||||
|
|
|
@ -3,8 +3,8 @@ import cn.hutool.core.util.RuntimeUtil
|
||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
|
|
||||||
def verName = "7.6.0-rc05"
|
def verName = "7.6.0-rc06"
|
||||||
def verCode = 200 + 3 * 17
|
def verCode = 200 + 3 * 18
|
||||||
|
|
||||||
if (System.getenv("DEBUG_BUILD") == "true") {
|
if (System.getenv("DEBUG_BUILD") == "true") {
|
||||||
verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1)")
|
verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1)")
|
||||||
|
|
|
@ -9,7 +9,7 @@ function flavor() {
|
||||||
|
|
||||||
source bin/app/build.sh
|
source bin/app/build.sh
|
||||||
|
|
||||||
rm -r TMessagesProj/build/outputs/apk
|
rm -rf TMessagesProj/build/outputs/apk
|
||||||
flavor Full
|
flavor Full
|
||||||
flavor Mini &
|
flavor Mini &
|
||||||
upload full/release
|
upload full/release
|
||||||
|
|
|
@ -7,7 +7,7 @@ function flavor() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
rm -r TMessagesProj/build/outputs/apk
|
rm -rf TMessagesProj/build/outputs/apk
|
||||||
|
|
||||||
flavor Full
|
flavor Full
|
||||||
flavor FullAppleEmoji
|
flavor FullAppleEmoji
|
||||||
|
|
|
@ -32,7 +32,7 @@ sed -i -e /play:core/d build.gradle
|
||||||
sed -i -e /firebase/d build.gradle
|
sed -i -e /firebase/d build.gradle
|
||||||
sed -i -e /gms/d build.gradle
|
sed -i -e /gms/d build.gradle
|
||||||
|
|
||||||
rm -r jni/boringssl/fuzz
|
rm -rf jni/boringssl/fuzz
|
||||||
rm jni/libwebp/swig/libwebp.jar
|
rm jni/libwebp/swig/libwebp.jar
|
||||||
rm jni/libwebp/gradle/wrapper/gradle-wrapper.jar
|
rm jni/libwebp/gradle/wrapper/gradle-wrapper.jar
|
||||||
rm jni/boringssl/util/ar/testdata/mac/libsample.a
|
rm jni/boringssl/util/ar/testdata/mac/libsample.a
|
||||||
|
@ -40,6 +40,6 @@ rm jni/boringssl/util/ar/testdata/linux/libsample.a
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
rm -r ssr-libev/src/main/jni/pcre/dist/testdata
|
rm -rf ssr-libev/src/main/jni/pcre/dist/testdata
|
||||||
rm -r ssr-libev/src/main/jni/mbedtls/programs/fuzz/corpuses
|
rm -rf ssr-libev/src/main/jni/mbedtls/programs/fuzz/corpuses
|
||||||
rm -r ssr-libev/src/main/jni/mbedtls/tests/data_files
|
rm -rf ssr-libev/src/main/jni/mbedtls/tests/data_files
|
||||||
|
|
|
@ -3,10 +3,12 @@
|
||||||
if [ -z "$ANDROID_HOME" ]; then
|
if [ -z "$ANDROID_HOME" ]; then
|
||||||
if [ -d "$HOME/Android/Sdk" ]; then
|
if [ -d "$HOME/Android/Sdk" ]; then
|
||||||
export ANDROID_HOME="$HOME/Android/Sdk"
|
export ANDROID_HOME="$HOME/Android/Sdk"
|
||||||
|
elif [ -d "$HOME/.local/lib/android/sdk" ]; then
|
||||||
|
export ANDROID_HOME="$HOME/.local/lib/android/sdk"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_NDK="$ANDROID_HOME/ndk/21.3.6528147"
|
_NDK="$ANDROID_HOME/ndk/21.4.7075529"
|
||||||
[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_HOME"
|
[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_HOME"
|
||||||
[ -f "$_NDK/source.properties" ] || _NDK="$NDK"
|
[ -f "$_NDK/source.properties" ] || _NDK="$NDK"
|
||||||
[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/ndk-bundle"
|
[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/ndk-bundle"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
source "bin/init/env.sh"
|
source "bin/init/env.sh"
|
||||||
|
|
||||||
git submodule update --init ss-rust/src/main/rust/shadowsocks-rust
|
git submodule update --init ss-rust/src/main/rust/shadowsocks-rust
|
||||||
rm -r ss-rust/build/outputs/aar
|
rm -rf ss-rust/build/outputs/aar
|
||||||
./gradlew ss-rust:assembleRelease || exit 1
|
./gradlew ss-rust:assembleRelease || exit 1
|
||||||
mkdir -p TMessagesProj/libs
|
mkdir -p TMessagesProj/libs
|
||||||
cp ss-rust/build/outputs/aar/* TMessagesProj/libs
|
cp ss-rust/build/outputs/aar/* TMessagesProj/libs
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
source "bin/init/env.sh"
|
source "bin/init/env.sh"
|
||||||
|
|
||||||
git submodule update --init 'ssr-libev/src/main/jni/*'
|
git submodule update --init 'ssr-libev/src/main/jni/*'
|
||||||
rm -r ssr-libev/build/outputs/aar
|
rm -rf ssr-libev/build/outputs/aar
|
||||||
./gradlew ssr-libev:assembleRelease || exit 1
|
./gradlew ssr-libev:assembleRelease || exit 1
|
||||||
mkdir -p TMessagesProj/libs
|
mkdir -p TMessagesProj/libs
|
||||||
cp ssr-libev/build/outputs/aar/* TMessagesProj/libs
|
cp ssr-libev/build/outputs/aar/* TMessagesProj/libs
|
||||||
|
|
|
@ -19,7 +19,7 @@ buildscript {
|
||||||
|
|
||||||
static String detectNdkVersion() {
|
static String detectNdkVersion() {
|
||||||
|
|
||||||
def version = "21.3.6528147"
|
def version = "21.4.7075529"
|
||||||
|
|
||||||
def androidHome = System.getenv("ANDROID_HOME")
|
def androidHome = System.getenv("ANDROID_HOME")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user