Merge branch 'master' into fast_build_rebased

This commit is contained in:
Henrik Grimler
2019-01-27 10:36:50 +01:00
21 changed files with 166 additions and 28 deletions

View File

@@ -1,5 +1,5 @@
TERMUX_NDK_VERSION=18
TERMUX_ANDROID_BUILD_TOOLS_VERSION=28.0.2
TERMUX_ANDROID_BUILD_TOOLS_VERSION=28.0.3
test -f "$HOME/.termuxrc" && . "$HOME/.termuxrc"

View File

@@ -43,4 +43,4 @@ fi
yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
# The android-21 platform is used in the ecj package:
yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" "platforms;android-27" "platforms;android-21"
yes | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" "platforms;android-28" "platforms;android-21"