diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index dd18abe9b..83b317610 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -302,8 +302,6 @@ jobs: sed -i -e "s/16384/6144/g" gradle.properties echo "sdk.dir=${ANDROID_HOME}" >> local.properties echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" >> local.properties - - name: Fix Compile SDK 31.0.0 - run: ./run init env - name: Gradle cache uses: actions/cache@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62d773951..c09e9e2e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -447,8 +447,6 @@ jobs: run: | sed -i -e "s/16384/6144/g" gradle.properties echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" > local.properties - - name: Fix Compile SDK 31.0.0 - run: ./run init env - name: Gradle cache uses: actions/cache@v2 with: diff --git a/bin/init/env.sh b/bin/init/env.sh index b3969a005..76c9f91cb 100755 --- a/bin/init/env.sh +++ b/bin/init/env.sh @@ -8,15 +8,6 @@ if [ -z "$ANDROID_HOME" ]; then fi fi -# Fix DX is missing in compile SDK 31.0.0 -if [ ! -f $ANDROID_HOME/build-tools/31.0.0/dx ]; then - echo "Copy dx From compile SDK 30.0.3" - cp $ANDROID_HOME/build-tools/30.0.3/dx $ANDROID_HOME/build-tools/31.0.0/dx -fi -if [ ! -f $ANDROID_HOME/build-tools/31.0.0/lib/dx.jar ]; then - echo "Copy lib/dx.jar From compile SDK 30.0.3" - cp $ANDROID_HOME/build-tools/30.0.3/lib/dx.jar $ANDROID_HOME/build-tools/31.0.0/lib/dx.jar -fi _NDK="$ANDROID_HOME/ndk/21.4.7075529" [ -f "$_NDK/source.properties" ] || _NDK="$ANDROID_NDK_HOME"