diff --git a/build-package.sh b/build-package.sh index 628dc6bf2..53287d5a0 100755 --- a/build-package.sh +++ b/build-package.sh @@ -254,7 +254,7 @@ termux_step_setup_variables() { : "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}" : "${TERMUX_DEBUG:=""}" : "${TERMUX_PKG_API_LEVEL:="21"}" - : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.3"}" + : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="26.0.1"}" : "${TERMUX_NDK_VERSION:="15.2"}" if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh index 95f55c582..d624d5514 100644 --- a/packages/aapt/build.sh +++ b/packages/aapt/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool" _TAG_VERSION=7.0.0 _TAG_REVISION=14 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION} -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli" @@ -298,7 +298,7 @@ termux_step_make_install () { rm -rf android-jar mkdir android-jar cd android-jar - cp $ANDROID_HOME/platforms/android-25/android.jar . + cp $ANDROID_HOME/platforms/android-26/android.jar . unzip -q android.jar mkdir -p $TERMUX_PREFIX/share/aapt zip -q $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc diff --git a/packages/ecj/build.sh b/packages/ecj/build.sh index 9a36e95b2..cc3cf412f 100755 --- a/packages/ecj/build.sh +++ b/packages/ecj/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.eclipse.org/jdt/core/ TERMUX_PKG_DESCRIPTION="Eclipse Compiler for Java" TERMUX_PKG_VERSION=4.6.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://ftp.acc.umu.se/mirror/eclipse.org/eclipse/downloads/drops4/R-4.6.2-201611241400/ecj-4.6.2.jar TERMUX_PKG_PLATFORM_INDEPENDENT=true @@ -27,7 +28,7 @@ termux_step_make () { cd android-jar # We need the android classes for JDT to compile against. - cp $ANDROID_HOME/platforms/android-25/android.jar . + cp $ANDROID_HOME/platforms/android-26/android.jar . unzip -q android.jar rm -Rf android.jar resources.arsc res assets zip -q -r android.jar . diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh index 4e0ddc8ab..7761f9af9 100755 --- a/scripts/setup-android-sdk.sh +++ b/scripts/setup-android-sdk.sh @@ -37,4 +37,5 @@ fi mkdir -p $ANDROID_HOME/licenses echo -e -n "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_HOME/licenses/android-sdk-license -$ANDROID_HOME/tools/bin/sdkmanager "build-tools;25.0.3" "platforms;android-25" +# The android-16 platform is used in the ecj package: +$ANDROID_HOME/tools/bin/sdkmanager "build-tools;26.0.1" "platforms;android-26" "platforms;android-16"