瀏覽代碼

Update NDK to latest LTS

世界 3 年之前
父節點
當前提交
3858f97135

+ 1 - 1
.github/workflows/debug.yml

@@ -292,6 +292,6 @@ jobs:
           BUILD_PLUGIN: none
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           ./run init action library
           ./run lint

+ 3 - 3
.github/workflows/release.yml

@@ -61,7 +61,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           ./run lib core
   build:
     name: Gradle Build
@@ -90,7 +90,7 @@ jobs:
           BUILD_PLUGIN: none
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           ./run init action library
           ./gradlew app:assembleOssRelease
@@ -200,7 +200,7 @@ jobs:
           BUILD_PLUGIN: none
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"

+ 2 - 2
.github/workflows/release_brook.yml

@@ -81,7 +81,7 @@ jobs:
           BUILD_PLUGIN: brook
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           ./run init action library
           ./gradlew :plugin:brook:assembleOssRelease
@@ -189,7 +189,7 @@ jobs:
           BUILD_PLUGIN: brook
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"

+ 2 - 2
.github/workflows/release_hysteria.yml

@@ -81,7 +81,7 @@ jobs:
           BUILD_PLUGIN: hysteria
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           ./run init action library
           ./gradlew :plugin:hysteria:assembleOssRelease
@@ -189,7 +189,7 @@ jobs:
           BUILD_PLUGIN: hysteria
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"

+ 2 - 2
.github/workflows/release_mieru.yml

@@ -81,7 +81,7 @@ jobs:
           BUILD_PLUGIN: mieru
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           ./run init action library
           ./gradlew :plugin:mieru:assembleOssRelease
@@ -189,7 +189,7 @@ jobs:
           BUILD_PLUGIN: mieru
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"

+ 3 - 3
.github/workflows/release_naive.yml

@@ -54,7 +54,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           ./run init action naive
           ./run plugin naive init
           ./run plugin naive ${{ matrix.arch }}
@@ -112,7 +112,7 @@ jobs:
           BUILD_PLUGIN: naive
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           ./run init action library
           ./gradlew :plugin:naive:assembleOssRelease
@@ -238,7 +238,7 @@ jobs:
           BUILD_PLUGIN: naive
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"

+ 2 - 2
.github/workflows/release_pingtunnel.yml

@@ -76,7 +76,7 @@ jobs:
           BUILD_PLUGIN: pingtunnel
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           ./run init action library
           ./gradlew :plugin:pingtunnel:assembleOssRelease
@@ -184,7 +184,7 @@ jobs:
           BUILD_PLUGIN: pingtunnel
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"

+ 2 - 2
.github/workflows/release_relaybaton.yml

@@ -76,7 +76,7 @@ jobs:
           BUILD_PLUGIN: relaybaton
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           ./run init action library
           ./gradlew :plugin:relaybaton:assembleOssRelease
@@ -184,7 +184,7 @@ jobs:
           BUILD_PLUGIN: relaybaton
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"

+ 2 - 2
.github/workflows/release_trojan_go.yml

@@ -76,7 +76,7 @@ jobs:
           BUILD_PLUGIN: trojan-go
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           ./run init action library
           ./gradlew :plugin:trojan-go:assembleOssRelease
@@ -184,7 +184,7 @@ jobs:
           BUILD_PLUGIN: trojan-go
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"

+ 2 - 2
.github/workflows/release_tuic.yml

@@ -85,7 +85,7 @@ jobs:
           BUILD_PLUGIN: tuic
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           ./run init action library
           ./gradlew :plugin:tuic:assembleOssRelease
@@ -193,7 +193,7 @@ jobs:
           BUILD_PLUGIN: tuic
         run: |
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/23.1.7779620" >> local.properties
+          echo "ndk.dir=${ANDROID_HOME}/ndk/25.0.8775105" >> local.properties
           export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"

+ 16 - 16
bin/init/env.sh

@@ -1,26 +1,26 @@
 #!/bin/bash
 
-if [ -z "$ANDROID_HOME" ]; then
-  if [ -d "$HOME/Android/Sdk" ]; then
-    export ANDROID_HOME="$HOME/Android/Sdk"
-  elif [ -d "$HOME/.local/lib/android/sdk" ]; then
-    export ANDROID_HOME="$HOME/.local/lib/android/sdk"
-  elif [ -d "$HOME/Library/Android/sdk" ]; then
-    export ANDROID_HOME="$HOME/Library/Android/sdk"
-  fi
-fi
+[ -d "$ANDROID_HOME" ] || ANDROID_HOME="$ANDROID_HOME"
+[ -d "$ANDROID_HOME" ] || ANDROID_HOME="$HOME/Android/Sdk"
+[ -d "$ANDROID_HOME" ] || ANDROID_HOME="$HOME/.local/lib/android/sdk"
+[ -d "$ANDROID_HOME" ] || ANDROID_HOME="$HOME/Library/Android/sdk"
 
-_NDK="$ANDROID_HOME/ndk/23.1.7779620"
-[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_HOME"
+_NDK="$ANDROID_HOME/ndk/25.0.8775105"
 [ -f "$_NDK/source.properties" ] || _NDK="$NDK"
-[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/ndk-bundle"
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_HOME"
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_ROOT"
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_LATEST_HOME"
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/23.2.8568313"
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/22.1.7171670"
 [ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/21.4.7075529"
+[ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_HOME/ndk-bundle"
 
 if [ ! -f "$_NDK/source.properties" ]; then
   echo "Error: NDK not found."
   exit 1
 fi
 
+export ANDROID_HOME
 export ANDROID_NDK_HOME=$_NDK
 export NDK=$_NDK
 
@@ -44,8 +44,8 @@ fi
 
 export TOOLCHAIN=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin
 
-export ANDROID_ARM_CC=$TOOLCHAIN/armv7a-linux-androideabi16-clang
-export ANDROID_ARM_CXX=$TOOLCHAIN/armv7a-linux-androideabi16-clang++
+export ANDROID_ARM_CC=$TOOLCHAIN/armv7a-linux-androideabi21-clang
+export ANDROID_ARM_CXX=$TOOLCHAIN/armv7a-linux-androideabi21-clang++
 export ANDROID_ARM_CC_21=$TOOLCHAIN/armv7a-linux-androideabi21-clang
 export ANDROID_ARM_CXX_21=$TOOLCHAIN/armv7a-linux-androideabi21-clang++
 
@@ -53,8 +53,8 @@ export ANDROID_ARM64_CC=$TOOLCHAIN/aarch64-linux-android21-clang
 export ANDROID_ARM64_CXX=$TOOLCHAIN/aarch64-linux-android21-clang++
 export ANDROID_ARM64_AR=$TOOLCHAIN/aarch64-linux-android21-ar
 
-export ANDROID_X86_CC=$TOOLCHAIN/i686-linux-android16-clang
-export ANDROID_X86_CXX=$TOOLCHAIN/i686-linux-android16-clang++
+export ANDROID_X86_CC=$TOOLCHAIN/i686-linux-android21-clang
+export ANDROID_X86_CXX=$TOOLCHAIN/i686-linux-android21-clang++
 export ANDROID_X86_CC_21=$TOOLCHAIN/i686-linux-android21-clang
 export ANDROID_X86_CXX_21=$TOOLCHAIN/i686-linux-android21-clang++
 

+ 1 - 1
buildSrc/src/main/kotlin/Helpers.kt

@@ -170,7 +170,7 @@ fun Project.setupKotlinCommon() {
 }
 
 fun Project.setupNdk() {
-    android.ndkVersion = "23.1.7779620"
+    android.ndkVersion = "25.0.8775105"
 }
 
 fun Project.setupNdkLibrary() {

+ 1 - 1
external/termux-view

@@ -1 +1 @@
-Subproject commit c4127827ef013970bcd0f930f65b991bb12878f4
+Subproject commit 9a7220ed87b068151fcf16b110a823d3c6954043

+ 1 - 1
external/v2ray-core

@@ -1 +1 @@
-Subproject commit f7e556acfff32b844c6a1c36c559df23ef356ec3
+Subproject commit 26e36b1cb46f387cacd65c1a5900be592913f842

+ 1 - 1
library/core

@@ -1 +1 @@
-Subproject commit 52cbec2c695806fc76e3dac7a64ed5fbfe22ef5e
+Subproject commit 186231d3505d0ca72e3904a3b0644cad3f39eac3

+ 2 - 0
lint.xml

@@ -38,4 +38,6 @@
     <issue id="ObsoleteLintCustomCheck" severity="informational" />
     <issue id="Registered" severity="informational" />
     <issue id="GradleDependency" severity="informational" />
+    <issue id="NewApi" severity="informational" />
+    <issue id="StringFormatMatches" severity="informational" />
 </lint>