From ca5ead67805a3cd88dac2154f94d35d8f8e4c108 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 27 Jan 2019 09:02:45 +0100 Subject: [PATCH] Update latest android platform and build-tools --- packages/aapt/build.sh | 2 +- packages/ecj/build.sh | 2 +- packages/ecj4.6/build.sh | 2 +- scripts/properties.sh | 2 +- scripts/setup-android-sdk.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh index c9b908bf6..5312c56d5 100644 --- a/packages/aapt/build.sh +++ b/packages/aapt/build.sh @@ -323,7 +323,7 @@ termux_step_make_install () { rm -rf android-jar mkdir android-jar cd android-jar - cp $ANDROID_HOME/platforms/android-27/android.jar . + cp $ANDROID_HOME/platforms/android-28/android.jar . unzip -q android.jar mkdir -p $TERMUX_PREFIX/share/aapt jar cfM $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc diff --git a/packages/ecj/build.sh b/packages/ecj/build.sh index 52b95975f..10300328c 100755 --- a/packages/ecj/build.sh +++ b/packages/ecj/build.sh @@ -51,7 +51,7 @@ termux_step_make () { cd android-jar # We need the android classes for JDT to compile against. - cp $ANDROID_HOME/platforms/android-27/android.jar . + cp $ANDROID_HOME/platforms/android-28/android.jar . unzip -q android.jar rm -Rf android.jar resources.arsc res assets jar cfM android.jar . diff --git a/packages/ecj4.6/build.sh b/packages/ecj4.6/build.sh index 5b02709ce..211e74d16 100755 --- a/packages/ecj4.6/build.sh +++ b/packages/ecj4.6/build.sh @@ -51,7 +51,7 @@ termux_step_make () { cd android-jar # We need the android classes for JDT to compile against. - cp $ANDROID_HOME/platforms/android-27/android.jar . + cp $ANDROID_HOME/platforms/android-28/android.jar . unzip -q android.jar rm -Rf android.jar resources.arsc res assets jar cfM android.jar . diff --git a/scripts/properties.sh b/scripts/properties.sh index bfa49f8d6..64ed69216 100644 --- a/scripts/properties.sh +++ b/scripts/properties.sh @@ -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" diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh index ab0a129be..e974eb316 100755 --- a/scripts/setup-android-sdk.sh +++ b/scripts/setup-android-sdk.sh @@ -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"