BearND has submitted this change and it was merged. Change subject: Update Android SDK version ......................................................................
Update Android SDK version Change-Id: I7857f03b07a6047f28d57c31b6732821d7a12d19 --- M bin/download-android-sdk.bash M bin/update-android-sdk.bash 2 files changed, 11 insertions(+), 5 deletions(-) Approvals: BearND: Verified; Looks good to me, approved diff --git a/bin/download-android-sdk.bash b/bin/download-android-sdk.bash index b395fe0..f330735 100644 --- a/bin/download-android-sdk.bash +++ b/bin/download-android-sdk.bash @@ -1,6 +1,12 @@ SDK_HOME_PATH="/srv/adk" +TMP_PATH="/tmp" +TMP_ADK_PATH="$TMP_PATH/android-sdk-linux" # Needs to be updated when new releases are made -SDK_DOWNLOAD_URL="http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz"; - -curl --location $SDK_DOWNLOAD_URL | tar -xz -C $SDK_HOME_PATH +SDK_DOWNLOAD_URL="http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz"; + +mkdir $TMP_ADK_PATH +curl --location $SDK_DOWNLOAD_URL | tar -xz -C $TMP_PATH + +chown -R android-build:android-build $TMP_ADK_PATH +mv $TMP_ADK_PATH $SDK_HOME_PATH diff --git a/bin/update-android-sdk.bash b/bin/update-android-sdk.bash index c28fba1..3bb5e64 100644 --- a/bin/update-android-sdk.bash +++ b/bin/update-android-sdk.bash @@ -1,9 +1,9 @@ SDK_PATH="/srv/adk" -SDK_PACKAGES="tools,platform-tools,build-tools-21.1.1,android-21,extra-android-m2repository" +SDK_PACKAGES="tools,platform-tools,build-tools-21.1.2,android-10,android-21,extra-android-m2repository" export JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64" export _JAVA_OPTIONS="-Xmx256m" export ANDROID_SWT="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext" - + # Just install platform-tools, build-tools & Android-19 # Filter names are from `android list sdk -e -a` expect -c " -- To view, visit https://gerrit.wikimedia.org/r/188478 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7857f03b07a6047f28d57c31b6732821d7a12d19 Gerrit-PatchSet: 2 Gerrit-Project: labs/tools/wikipedia-android-builds Gerrit-Branch: master Gerrit-Owner: BearND <[email protected]> Gerrit-Reviewer: BearND <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
