BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/188433
Change subject: Updated Android SDK and gitignore ...................................................................... Updated Android SDK and gitignore Change-Id: Ide4b53d855b15173cec860f6dd70693510a0509f --- M .gitignore M bin/download-android-sdk.bash M bin/update-android-sdk.bash 3 files changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikipedia-android-builds refs/changes/33/188433/1 diff --git a/.gitignore b/.gitignore index dc6fb23..13adc32 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,9 @@ apache-maven*/ wikipedia/ job/ +public_html/runs/ tmp/ *.log *.cnf +*.pyc .* diff --git a/bin/download-android-sdk.bash b/bin/download-android-sdk.bash index b395fe0..93c059d 100644 --- a/bin/download-android-sdk.bash +++ b/bin/download-android-sdk.bash @@ -1,6 +1,13 @@ 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"; +SDK_DOWNLOAD_URL="http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz"; -curl --location $SDK_DOWNLOAD_URL | tar -xz -C $SDK_HOME_PATH + +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..3f58f25 100644 --- a/bin/update-android-sdk.bash +++ b/bin/update-android-sdk.bash @@ -1,5 +1,5 @@ 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" -- To view, visit https://gerrit.wikimedia.org/r/188433 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ide4b53d855b15173cec860f6dd70693510a0509f Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikipedia-android-builds Gerrit-Branch: master Gerrit-Owner: BearND <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
