TEMP: Update NDK on CI

termux · Aug 17, 2021 · 745ab73 · 745ab73
1 parent af68f53
commit 745ab73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -117,6 +117,8 @@ jobs:
         fi
 
         if [ -f ./built_packages.txt ]; then
+          ./scripts/run-docker.sh ./scripts/setup-android-sdk.sh
+
           ./scripts/lint-packages.sh $(cat ./built_packages.txt | awk '{print "packages/"$1"/build.sh"}')
           ./scripts/run-docker.sh ./build-package.sh -I -a ${{ matrix.target_arch }} $(cat ./built_packages.txt)
         fi

diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh
@@ -25,6 +25,8 @@ if [ ! -d $ANDROID_HOME ]; then
 	rm tools.zip
 fi
 
+more $NDK/source.properties
+rm -rf $NDK
 if [ ! -d $NDK ]; then
 	mkdir -p $NDK
 	cd $NDK/..
@@ -37,14 +39,5 @@ if [ ! -d $NDK ]; then
 	unzip -q ndk.zip
 	mv android-ndk-r$TERMUX_NDK_VERSION $(basename $NDK)
 	rm ndk.zip
+	more $NDK/source.properties
 fi
-
-yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME --licenses
-
-# The android platforms are used in the ecj and apksigner packages:
-yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME \
-		"platform-tools" \
-		"build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" \
-		"platforms;android-28" \
-		"platforms;android-24" \
-		"platforms;android-21"